[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  b1f9db698011e5a178d53483eccfd0a44f132baf (commit)
      from  aba03ae571ea677fc484daef00a21ca8f7e82708 (commit)


- Log -----------------------------------------------------------------
commit b1f9db698011e5a178d53483eccfd0a44f132baf
Author: Attila Szakacs <attila.szakacs at oneidentity.com>
Date:   Thu Jun 25 13:40:33 2020 +0200

    Configuration: do not overwrite BASE_unix ex_libs in AIX
    
    BASE_unix sets ex_libs to `-lz` based the on zlib linking.
    AIX platforms overwrote this instead of adding to it.
    
    CLA: Trivial
    
    Signed-off-by: Attila Szakacs <attila.szakacs at oneidentity.com>
    
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/12271)

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

Summary of changes:
 Configurations/10-main.conf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 3332f03765..0313ad0a37 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1173,7 +1173,7 @@ my %targets = (
         CFLAGS           => picker(debug   => "-O0 -g",
                                    release => "-O"),
         cflags           => add(threads("-pthread")),
-        ex_libs          => threads("-pthread"),
+        ex_libs          => add(threads("-pthread")),
         bn_ops           => "BN_LLONG RC4_CHAR",
         asm_arch         => 'ppc32',
         perlasm_scheme   => "aix32",
@@ -1187,7 +1187,7 @@ my %targets = (
         CFLAGS           => picker(debug   => "-O0 -g",
                                    release => "-O"),
         cflags           => combine("-maix64", threads("-pthread")),
-        ex_libs          => threads("-pthread"),
+        ex_libs          => add(threads("-pthread")),
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
         asm_arch         => 'ppc64',
         perlasm_scheme   => "aix64",
@@ -1204,7 +1204,7 @@ my %targets = (
         cflags           => combine("-q32 -qmaxmem=16384 -qro -qroconst",
                                     threads("-qthreaded")),
         cppflags         => threads("-D_THREAD_SAFE"),
-        ex_libs          => threads("-lpthreads"),
+        ex_libs          => add(threads("-lpthreads")),
         bn_ops           => "BN_LLONG RC4_CHAR",
         asm_arch         => 'ppc32',
         perlasm_scheme   => "aix32",
@@ -1220,7 +1220,7 @@ my %targets = (
         cflags           => combine("-q64 -qmaxmem=16384 -qro -qroconst",
                                     threads("-qthreaded")),
         cppflags         => threads("-D_THREAD_SAFE"),
-        ex_libs          => threads("-lpthreads"),
+        ex_libs          => add(threads("-lpthreads")),
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
         asm_arch         => 'ppc64',
         perlasm_scheme   => "aix64",