The branch master has been updated via 3a19f1a9dd16f5855a7e2a42cd3e7f136f849bd3 (commit) from 1cafbb799a373f0d6ba55843fd51692e14c0fe09 (commit)
- Log ----------------------------------------------------------------- commit 3a19f1a9dd16f5855a7e2a42cd3e7f136f849bd3 Author: Richard Levitte <levi...@openssl.org> Date: Thu Jul 2 18:48:16 2020 +0200 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 <m...@openssl.org> Reviewed-by: Shane Lontis <shane.lon...@oracle.com> (Merged from https://github.com/openssl/openssl/pull/12360) ----------------------------------------------------------------------- Summary of changes: Configurations/10-main.conf | 2 +- util/mkdef.pl | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index c30954f27d..5baab6f306 100644 --- 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 a7d353f3db..5e02c7dafb 100755 --- 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,