diff options
| author | Todd Short <tshort@akamai.com> | 2022-02-09 15:59:37 -0500 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2022-02-16 10:13:30 +1100 |
| commit | 59de5a5e8603fb5e2e7b0aa78224152700ad905a (patch) | |
| tree | 223ce0d6e9db4d497a11c1daf5e3cdd88aa64f3c /util/perl/OpenSSL/config.pm | |
| parent | 3948abaf4458aac66bf47546874d0fb5a73a78a0 (diff) | |
Force macOS 10.15 or later to be 64-bit
macOS Catalina (10.15) no longer supports 32-bit applications.
Do not wait 5 seconds to give the user the option of using KERNEL_BITS=32
Do not accept the KERNEL_BITS=32 option
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17675)
(cherry picked from commit b926548b362531e8a64e7482c081611fab7183a8)
Diffstat (limited to 'util/perl/OpenSSL/config.pm')
| -rwxr-xr-x | util/perl/OpenSSL/config.pm | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/util/perl/OpenSSL/config.pm b/util/perl/OpenSSL/config.pm index 81e9a03b48..17786defad 100755 --- a/util/perl/OpenSSL/config.pm +++ b/util/perl/OpenSSL/config.pm @@ -485,6 +485,14 @@ EOF [ 'x86_64-apple-darwin.*', sub { my $KERNEL_BITS = $ENV{KERNEL_BITS} // ''; + # macOS >= 10.15 is 64-bit only + my $SW_VERS = `sw_vers -productVersion 2>/dev/null`; + if ($SW_VERS =~ /^(\d+)\.(\d+)\.(\d+)$/) { + if ($1 > 10 || ($1 == 10 && $2 >= 15)) { + die "32-bit applications not supported on macOS 10.15 or later\n" if $KERNEL_BITS eq '32'; + return { target => "darwin64-x86_64" }; + } + } return { target => "darwin-i386" } if $KERNEL_BITS eq '32'; print <<EOF; |