summaryrefslogtreecommitdiffstats
path: root/Configurations/10-main.conf
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2018-06-13 11:10:27 +0200
committerAndy Polyakov <appro@openssl.org>2018-06-14 21:24:38 +0200
commit82b6b0848cea95de821a7f901bd8b0b5dab17fa4 (patch)
treed225c3b8973dc12609ba2b6cbfc580ec27d61930 /Configurations/10-main.conf
parent0ef40b76e745731a28f7340071c051316b8a1bae (diff)
Configurations/10-main.conf: improve Makefile readability on AIX and Solaris.
Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/6477)
Diffstat (limited to 'Configurations/10-main.conf')
-rw-r--r--Configurations/10-main.conf14
1 files changed, 7 insertions, 7 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 152a37fa4e..54f609d80e 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -232,7 +232,7 @@ my %targets = (
ex_libs => add(threads("-pthread")),
bn_ops => "BN_LLONG",
shared_cflag => "-fPIC",
- shared_ldflag => add("-shared -static-libgcc"),
+ shared_ldflag => add_before("-shared -static-libgcc"),
},
"solaris64-x86_64-gcc" => {
# -shared -static-libgcc might appear controversial, but modules
@@ -254,7 +254,7 @@ my %targets = (
bn_ops => "SIXTY_FOUR_BIT_LONG",
perlasm_scheme => "elf",
shared_cflag => "-fPIC",
- shared_ldflag => add("-shared -static-libgcc"),
+ shared_ldflag => add_before("-shared -static-libgcc"),
multilib => "/64",
},
@@ -285,7 +285,7 @@ my %targets = (
bn_ops => "SIXTY_FOUR_BIT_LONG",
perlasm_scheme => "elf",
shared_cflag => "-KPIC",
- shared_ldflag => add("-G -dy -z text"),
+ shared_ldflag => add_before("-G -dy -z text"),
multilib => "/64",
},
@@ -301,7 +301,7 @@ my %targets = (
ex_libs => add(threads("-pthread")),
bn_ops => "BN_LLONG RC4_CHAR",
shared_cflag => "-fPIC",
- shared_ldflag => add("-shared"),
+ shared_ldflag => add_before("-shared"),
},
"solaris-sparcv8-gcc" => {
inherit_from => [ "solaris-sparcv7-gcc", asm("sparcv8_asm") ],
@@ -336,7 +336,7 @@ my %targets = (
ex_libs => add(threads("-lpthread")),
bn_ops => "BN_LLONG RC4_CHAR",
shared_cflag => "-KPIC",
- shared_ldflag => add("-G -dy -z text"),
+ shared_ldflag => add_before("-G -dy -z text"),
},
####
"solaris-sparcv8-cc" => {
@@ -1143,7 +1143,7 @@ my %targets = (
ex_libs => threads("-pthread"),
bn_ops => "BN_LLONG RC4_CHAR",
perlasm_scheme => "aix32",
- shared_ldflag => add("-shared -static-libgcc"),
+ shared_ldflag => add_before("-shared -static-libgcc"),
AR => add("-X32"),
RANLIB => add("-X32"),
},
@@ -1156,7 +1156,7 @@ my %targets = (
ex_libs => threads("-pthread"),
bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
perlasm_scheme => "aix64",
- shared_ldflag => add("-shared -static-libgcc"),
+ shared_ldflag => add_before("-shared -static-libgcc"),
AR => add("-X64"),
RANLIB => add("-X64"),
},