Skip to content

Commit

Permalink
Configuration and build: Fix solaris tags
Browse files Browse the repository at this point in the history
The shared_target attrribute for Solaris built with gcc wasn't right
and shared libraries couldn't be properly built.

Fixes openssl#12356

Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Shane Lontis <[email protected]>
(Merged from openssl#12360)
  • Loading branch information
levitte committed Jul 4, 2020
1 parent 1cafbb7 commit 3a19f1a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Configurations/10-main.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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" => {
Expand Down
1 change: 1 addition & 0 deletions util/mkdef.pl
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@
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,
Expand Down

0 comments on commit 3a19f1a

Please sign in to comment.