diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-07-02 18:48:16 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-07-04 10:38:46 +0200 |
| commit | 3a19f1a9dd16f5855a7e2a42cd3e7f136f849bd3 (patch) | |
| tree | d1297fa76b61d867a632973c327d03dc0619b982 | |
| parent | 1cafbb799a373f0d6ba55843fd51692e14c0fe09 (diff) | |
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)
| -rw-r--r-- | Configurations/10-main.conf | 2 | ||||
| -rwxr-xr-x | util/mkdef.pl | 1 |
2 files changed, 2 insertions, 1 deletions
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, |