[openssl] master update

[shane.lontis at oracle.com]

The branch master has been updated
       via  53043311560f836ce65e7ad55423363901d1287a (commit)
      from  f64f17c3e011a00febed2bf6bc17ca7e030fc69e (commit)


- Log -----------------------------------------------------------------
commit 53043311560f836ce65e7ad55423363901d1287a
Author: Jean-Christophe Fillion-Robin <jchris.fillionr at kitware.com>
Date:   Tue Jun 23 02:37:22 2020 -0400

    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 at openssl.org>
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/12238)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/10-main.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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",