From 491aee866bb94a93e804b2980bb5af2465619cf8 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Wed, 27 Oct 2021 09:51:09 -0600 Subject: [PATCH] Build arm64e ABI binaries on macOS 11 and above. We originally used arm64 here but the correct ABI is arm64e. The arm64 arch will be removed in a future release. --- scripts/mkpkg | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/mkpkg b/scripts/mkpkg index 4eed3a6cb..5c44fd436 100755 --- a/scripts/mkpkg +++ b/scripts/mkpkg @@ -340,9 +340,11 @@ case "$osversion" in # Build intel universal binaries for 10.6 and below ARCH_FLAGS="-arch i386 -arch x86_64" ;; - macos11*) - # Build arm64/x86_64 universal binaries for macOS 11 - ARCH_FLAGS="-arch arm64 -arch x86_64" + macos1[1-9]*) + # Build arm64e/x86_64 universal binaries for macOS 11 and up + # We originally used arm64 here but the correct ABI is arm64e. + # The arm64 arch will be removed in a future release. + ARCH_FLAGS="-arch arm64 -arch arm64e -arch x86_64" ;; esac if test "${osversion}" != "`$scriptdir/pp --probe`"; then