diff options
| author | Tim Hudson <tjh@cryptsoft.com> | 2020-11-26 12:31:25 +1000 |
|---|---|---|
| committer | Tim Hudson <tjh@openssl.org> | 2020-12-02 08:51:52 +1000 |
| commit | 8758f4e6256d46867bda2dcdd5cf18dd037aaf8c (patch) | |
| tree | 2611abed2c67edbb9b61f476bc0b72799d034834 /util/perl/OpenSSL/config.pm | |
| parent | 9ab9b16bb795f1081e86f11e16a1606790231400 (diff) | |
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 <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13517)
Diffstat (limited to 'util/perl/OpenSSL/config.pm')
| -rwxr-xr-x | util/perl/OpenSSL/config.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/perl/OpenSSL/config.pm b/util/perl/OpenSSL/config.pm index fb9c5ca11b..776e448df4 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) ], |