mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-21 01:15:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Configuration and build: Fix solaris tags

Browse Source 
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)
This commit is contained in:
Richard Levitte 2020-07-02 18:48:16 +02:00
parent 1cafbb799a
commit 3a19f1a9dd
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Configurations/10-main.conf
View File

@ -225,7 +225,7 @@ my %targets = (
"solaris-common-gcc" => { "solaris-common-gcc" => {
inherit_from => [ "solaris-common" ], inherit_from => [ "solaris-common" ],
template => 1, 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 with GNU C setups
"solaris-x86-gcc" => { "solaris-x86-gcc" => {

1
util/mkdef.pl
View File

@ -107,6 +107,7 @@ my %OS_data = (
solaris => { writer => \&writer_linux, solaris => { writer => \&writer_linux,
sort => sorter_linux(), sort => sorter_linux(),
platforms => { UNIX => 1 } }, platforms => { UNIX => 1 } },
"solaris-gcc" => 'solaris', # alias
linux => 'solaris', # alias linux => 'solaris', # alias
"bsd-gcc" => 'solaris', # alias "bsd-gcc" => 'solaris', # alias
aix => { writer => \&writer_aix, aix => { writer => \&writer_aix,