Configuration and build: Fix solaris tags

The shared_target attrribute for Solaris built with gcc wasn't right
and shared libraries couldn't be properly built.

Fixes #12356

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12360)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index c30954f27da48769c6a5eed593dad8f95f8706bf..5baab6f306f133d917d279ebcf7dae6fe4cd9ebe 100644 (file)
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -225,7 +225,7 @@ my %targets = (
     "solaris-common-gcc" => {
         inherit_from     => [ "solaris-common" ],
         template         => 1,
-        shared_target    => "solaris-gcc", # The rest is on shared_info.pl
+        shared_target    => "solaris-gcc-shared", # The rest is on shared_info.pl
     },
 #### Solaris x86 with GNU C setups
     "solaris-x86-gcc" => {

diff --git a/util/mkdef.pl b/util/mkdef.pl
index a7d353f3db689a708764a59d7745cf6151b728bc..5e02c7dafbcf5849549cdc277751a8f3d686c4e1 100755 (executable)
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -107,6 +107,7 @@ my %OS_data = (
     solaris     => { writer     => \&writer_linux,
                      sort       => sorter_linux(),
                      platforms  => { UNIX                       => 1 } },
+    "solaris-gcc" => 'solaris', # alias
     linux       => 'solaris',   # alias
     "bsd-gcc"   => 'solaris',   # alias
     aix         => { writer     => \&writer_aix,