The branch master has been updated
via 2a23cd7f5063c27c48357654c3e8b5b6f3855d1c (commit)
from 12636c149d7cd76657d5c8da8e848a1f3c7c5c3b (commit)
- Log -----------------------------------------------------------------
commit 2a23cd7f5063c27c48357654c3e8b5b6f3855d1c
Author: Andy Polyakov <[email protected]>
Date: Wed Mar 21 20:04:49 2018 +0100
Configurations/10-main.conf: correct AIX targets.
Reviewed-by: Rich Salz <[email protected]>
Reviewed-by: Richard Levitte <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/5713)
-----------------------------------------------------------------------
Summary of changes:
Configurations/10-main.conf | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 72695d5..f27691f 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1176,7 +1176,8 @@ my %targets = (
shared_target => "aix-shared",
shared_ldflag => "-shared -static-libgcc -Wl,-G",
shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
- arflags => "-X32 r",
+ AR => add("-X32"),
+ RANLIB => add("-X32"),
},
"aix64-gcc" => {
inherit_from => [ "BASE_unix", asm("ppc64_asm") ],
@@ -1194,7 +1195,8 @@ my %targets = (
shared_target => "aix-shared",
shared_ldflag => "-shared -static-libgcc -Wl,-G",
shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
- arflags => "-X64 r",
+ AR => add("-X64"),
+ RANLIB => add("-X64"),
},
"aix-cc" => {
inherit_from => [ "BASE_unix", asm("ppc32_asm") ],
@@ -1215,7 +1217,8 @@ my %targets = (
shared_cflag => "-qpic",
shared_ldflag => "-G",
shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
- arflags => "-X32 r",
+ AR => add("-X32"),
+ RANLIB => add("-X32"),
},
"aix64-cc" => {
inherit_from => [ "BASE_unix", asm("ppc64_asm") ],
@@ -1236,7 +1239,8 @@ my %targets = (
shared_cflag => "-qpic",
shared_ldflag => "-G",
shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
- arflags => "-X64 r",
+ AR => add("-X64"),
+ RANLIB => add("-X64"),
},
# SIEMENS BS2000/OSD: an EBCDIC-based mainframe
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
