Back out f2d82771e7dd, arm64e on macOS is still in preview state.

Until arm64e on macOS is finalized, continue to build arm64 packages.
This commit is contained in:
Todd C. Miller
2021-10-29 13:03:36 -06:00
parent 491aee866b
commit 12c8dba4ca

View File

@@ -340,11 +340,9 @@ case "$osversion" in
# Build intel universal binaries for 10.6 and below # Build intel universal binaries for 10.6 and below
ARCH_FLAGS="-arch i386 -arch x86_64" ARCH_FLAGS="-arch i386 -arch x86_64"
;; ;;
macos1[1-9]*) macos11*)
# Build arm64e/x86_64 universal binaries for macOS 11 and up # Build arm64/x86_64 universal binaries for macOS 11
# We originally used arm64 here but the correct ABI is arm64e. ARCH_FLAGS="-arch arm64 -arch x86_64"
# The arm64 arch will be removed in a future release.
ARCH_FLAGS="-arch arm64 -arch arm64e -arch x86_64"
;; ;;
esac esac
if test "${osversion}" != "`$scriptdir/pp --probe`"; then if test "${osversion}" != "`$scriptdir/pp --probe`"; then