From c437fc2d481ab62b76b11270293392649dd092d3 Mon Sep 17 00:00:00 2001 From: Attila Szakacs Date: Thu, 25 Jun 2020 13:40:33 +0200 Subject: 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 Reviewed-by: Shane Lontis Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/12271) (cherry picked from commit b1f9db698011e5a178d53483eccfd0a44f132baf) --- Configurations/10-main.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Configurations') diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index d61b9ee108..3b07731db8 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -1125,7 +1125,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", perlasm_scheme => "aix32", shared_ldflag => add_before("-shared -static-libgcc"), @@ -1138,7 +1138,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", perlasm_scheme => "aix64", shared_ldflag => add_before("-shared -static-libgcc"), @@ -1154,7 +1154,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", perlasm_scheme => "aix32", shared_cflag => "-qpic", @@ -1169,7 +1169,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", perlasm_scheme => "aix64", dso_scheme => "dlfcn", -- cgit v1.2.3