diff options
| author | Matt Caswell <matt@openssl.org> | 2020-11-05 15:13:25 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-11-06 17:20:54 +0000 |
| commit | 5800d0414be113b6d710c1a23a8097842cfc675b (patch) | |
| tree | 0ef8a7d26eb2ac16c9a89b2e9200168ee90005e7 /util/perl | |
| parent | 3eb84c62859591eccab32fababe0314942e09461 (diff) | |
| download | openssl-new-5800d0414be113b6d710c1a23a8097842cfc675b.tar.gz | |
Correct system guessing for solaris64-x86_64-* targets
Previously the system guessing script was choosing a target that did not
exist for these platforms.
Fixes #13323
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13327)
Diffstat (limited to 'util/perl')
| -rwxr-xr-x | util/perl/OpenSSL/config.pm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/util/perl/OpenSSL/config.pm b/util/perl/OpenSSL/config.pm index e494ddd969..fb9c5ca11b 100755 --- a/util/perl/OpenSSL/config.pm +++ b/util/perl/OpenSSL/config.pm @@ -704,13 +704,16 @@ EOF my $KERNEL_BITS = $ENV{KERNEL_BITS}; my $ISA64 = `isainfo 2>/dev/null | grep amd64`; my $KB = $KERNEL_BITS // '64'; - return { target => "solaris64-x86_64" } - if $ISA64 ne "" && $KB eq '64'; + if ($ISA64 ne "" && $KB eq '64') { + return { target => "solaris64-x86_64-gcc" } if $CCVENDOR eq "gnu"; + return { target => "solaris64-x86_64-cc" }; + } my $REL = uname('-r'); $REL =~ s/5\.//; my @tmp_disable = (); push @tmp_disable, 'sse2' if int($REL) < 10; - return { target => "solaris-x86", + #There is no solaris-x86-cc target + return { target => "solaris-x86-gcc", disable => [ @tmp_disable ] }; } ], |