From 8758f4e6256d46867bda2dcdd5cf18dd037aaf8c Mon Sep 17 00:00:00 2001 From: Tim Hudson Date: Thu, 26 Nov 2020 12:31:25 +1000 Subject: [PATCH] Correct system guessing for darwin64-arm64 target Previously the system guessing logic would incorrectly guess i686-apple-darwin as the fallback for any unspecified architecture that is a Darwin target Reviewed-by: Matt Caswell Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/13517) --- util/perl/OpenSSL/config.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/perl/OpenSSL/config.pm b/util/perl/OpenSSL/config.pm index fb9c5ca11b1..776e448df4d 100755 --- a/util/perl/OpenSSL/config.pm +++ b/util/perl/OpenSSL/config.pm @@ -140,8 +140,7 @@ my $guess_patterns = [ [ 'Paragon.*?:.*', 'i860-intel-osf1' ], [ 'Rhapsody:.*', 'ppc-apple-rhapsody' ], [ 'Darwin:.*?:.*?:Power.*', 'ppc-apple-darwin' ], - [ 'Darwin:.*?:.*?:x86_64', 'x86_64-apple-darwin' ], - [ 'Darwin:.*', 'i686-apple-darwin' ], + [ 'Darwin:.*', '${MACHINE}-apple-darwin' ], [ 'SunOS:5\..*', '${MACHINE}-whatever-solaris2' ], [ 'SunOS:.*', '${MACHINE}-sun-sunos4' ], [ 'UNIX_System_V:4\..*?:.*', '${MACHINE}-whatever-sysv4' ], @@ -483,6 +482,7 @@ EOF return { target => "darwin64-x86_64" }; } ], + [ 'arm64-apple-darwin.*', { target => "darwin64-arm64" } ], [ 'armv6\+7-.*-iphoneos', { target => "iphoneos-cross", cflags => [ qw(-arch armv6 -arch armv7) ], -- 2.47.3