From: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Date: Tue, 23 Jun 2020 06:37:22 +0000 (-0400)
Subject: Fix linking against non-system zlib on macOS
X-Git-Tag: openssl-3.0.0-alpha6~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53043311560f836ce65e7ad55423363901d1287a;p=thirdparty%2Fopenssl.git

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)
---

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 895317dbb66..fc9f3bbea63 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",