Pass "-z defs" to the linker via "-Wl,-z,defs" rather than with gcc's -z

[openssl.git] / Configurations / shared-info.pl

diff --git a/Configurations/shared-info.pl b/Configurations/shared-info.pl
index 83f28bd36716237e21aaa659a6daa4234b3d39ad..461ce3c51f5dd7abf37e8bd44740d4de5c7b6ad2 100644 (file)
--- a/Configurations/shared-info.pl
+++ b/Configurations/shared-info.pl
@@ -33,9 +33,10 @@ my %shared_info;
             %{$shared_info{'gnu-shared'}},
             shared_defflag    => '-Wl,--version-script=',
             dso_ldflags       =>
-                $disabled{asan} && $disabled{msan} && $disabled{ubsan}
-                ? '-z defs'
-                : '',
+                (grep /(?:^|\s)-fsanitize/,
+                 @{$config{CFLAGS}}, @{$config{cflags}})
+                ? ''
+                : '-Wl,-z,defs',
         };
     },
     'bsd-gcc-shared' => sub { return $shared_info{'linux-shared'}; },
@@ -83,4 +84,16 @@ my %shared_info;
             shared_sonameflag => '-h ',
         };
     },
+    'solaris-gcc-shared' => sub {
+        return $shared_info{'linux-shared'} if detect_gnu_ld();
+        return {
+            # Note: we should also have -shared here, but because some
+            # config targets define it with an added -static-libgcc
+            # following it, we don't want to change the order.  This
+            # forces all solaris gcc config targets to define shared_ldflag
+            shared_ldflag     => '-Wl,-Bsymbolic',
+            shared_defflag    => "-Wl,-M,",
+            shared_sonameflag => "-Wl,-h,",
+        };
+    },
 );