mirror of https://github.com/openssl/openssl
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)
This commit is contained in:
parent
aba03ae571
commit
b1f9db6980
|
@ -1173,7 +1173,7 @@ my %targets = (
|
||||||
CFLAGS => picker(debug => "-O0 -g",
|
CFLAGS => picker(debug => "-O0 -g",
|
||||||
release => "-O"),
|
release => "-O"),
|
||||||
cflags => add(threads("-pthread")),
|
cflags => add(threads("-pthread")),
|
||||||
ex_libs => threads("-pthread"),
|
ex_libs => add(threads("-pthread")),
|
||||||
bn_ops => "BN_LLONG RC4_CHAR",
|
bn_ops => "BN_LLONG RC4_CHAR",
|
||||||
asm_arch => 'ppc32',
|
asm_arch => 'ppc32',
|
||||||
perlasm_scheme => "aix32",
|
perlasm_scheme => "aix32",
|
||||||
|
@ -1187,7 +1187,7 @@ my %targets = (
|
||||||
CFLAGS => picker(debug => "-O0 -g",
|
CFLAGS => picker(debug => "-O0 -g",
|
||||||
release => "-O"),
|
release => "-O"),
|
||||||
cflags => combine("-maix64", threads("-pthread")),
|
cflags => combine("-maix64", threads("-pthread")),
|
||||||
ex_libs => threads("-pthread"),
|
ex_libs => add(threads("-pthread")),
|
||||||
bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
|
bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
|
||||||
asm_arch => 'ppc64',
|
asm_arch => 'ppc64',
|
||||||
perlasm_scheme => "aix64",
|
perlasm_scheme => "aix64",
|
||||||
|
@ -1204,7 +1204,7 @@ my %targets = (
|
||||||
cflags => combine("-q32 -qmaxmem=16384 -qro -qroconst",
|
cflags => combine("-q32 -qmaxmem=16384 -qro -qroconst",
|
||||||
threads("-qthreaded")),
|
threads("-qthreaded")),
|
||||||
cppflags => threads("-D_THREAD_SAFE"),
|
cppflags => threads("-D_THREAD_SAFE"),
|
||||||
ex_libs => threads("-lpthreads"),
|
ex_libs => add(threads("-lpthreads")),
|
||||||
bn_ops => "BN_LLONG RC4_CHAR",
|
bn_ops => "BN_LLONG RC4_CHAR",
|
||||||
asm_arch => 'ppc32',
|
asm_arch => 'ppc32',
|
||||||
perlasm_scheme => "aix32",
|
perlasm_scheme => "aix32",
|
||||||
|
@ -1220,7 +1220,7 @@ my %targets = (
|
||||||
cflags => combine("-q64 -qmaxmem=16384 -qro -qroconst",
|
cflags => combine("-q64 -qmaxmem=16384 -qro -qroconst",
|
||||||
threads("-qthreaded")),
|
threads("-qthreaded")),
|
||||||
cppflags => threads("-D_THREAD_SAFE"),
|
cppflags => threads("-D_THREAD_SAFE"),
|
||||||
ex_libs => threads("-lpthreads"),
|
ex_libs => add(threads("-lpthreads")),
|
||||||
bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
|
bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
|
||||||
asm_arch => 'ppc64',
|
asm_arch => 'ppc64',
|
||||||
perlasm_scheme => "aix64",
|
perlasm_scheme => "aix64",
|
||||||
|
|
Loading…
Reference in New Issue