zzy/openssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct system guessing for solaris64-x86_64-* targets

Browse Source 
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)
This commit is contained in:
Matt Caswell 2020-11-05 15:13:25 +00:00
parent 3eb84c6285
commit 5800d0414b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
util/perl/OpenSSL/config.pm
View File

@ -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 ] };
}
],