From 5800d0414be113b6d710c1a23a8097842cfc675b Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Thu, 5 Nov 2020 15:13:25 +0000 Subject: [PATCH] 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 Reviewed-by: Paul Dale Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/13327) --- util/perl/OpenSSL/config.pm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/util/perl/OpenSSL/config.pm b/util/perl/OpenSSL/config.pm index e494ddd969e..fb9c5ca11b1 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 ] }; } ], -- 2.47.2