diff options
| author | Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com> | 2020-06-23 02:37:22 -0400 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2020-07-20 09:26:04 +1000 |
| commit | 53043311560f836ce65e7ad55423363901d1287a (patch) | |
| tree | 9c378abf1d920432f81963bc9db95ed03c1ceebc /Configurations | |
| parent | f64f17c3e011a00febed2bf6bc17ca7e030fc69e (diff) | |
Fix linking against non-system zlib on macOS
This commit ensures the -L/path/to/zlib flag associated with ldflags
property set in "Configurations/00-base-templates.conf" (under "BASE_unix")
is inherited when defining "darwin-common" configuration.
CLA: trivial
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12238)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/10-main.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 895317dbb6..fc9f3bbea6 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -1563,7 +1563,7 @@ my %targets = ( CFLAGS => picker(debug => "-g -O0", release => "-O3"), cppflags => threads("-D_REENTRANT"), - lflags => "-Wl,-search_paths_first", + lflags => add("-Wl,-search_paths_first"), sys_id => "MACOSX", bn_ops => "BN_LLONG RC4_CHAR", thread_scheme => "pthreads", |