Configurations/10-main.conf: improve Makefile readability on AIX and Solaris.
authorAndy Polyakov <appro@openssl.org>
Wed, 13 Jun 2018 09:10:27 +0000 (11:10 +0200)
committerAndy Polyakov <appro@openssl.org>
Thu, 14 Jun 2018 19:24:38 +0000 (21:24 +0200)
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6477)

Configurations/10-main.conf

index 152a37fa4e12ac981094c1f42943ae19b7c99a35..54f609d80eb901af567234f1fa4e0952ed31f788 100644 (file)
@@ -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"),
     },