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@oneidentity.com>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12271)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 3332f03765082beae0b9925058df452e2f15ea38..0313ad0a37b77661becfc5b99cb5a40f5aceda15 100644 (file)
--- 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")),
         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",
         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")),
         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",
         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"),
         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",
         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"),
         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",
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
         asm_arch         => 'ppc64',
         perlasm_scheme   => "aix64",