diff --git a/src/test-clang.bats b/src/test-clang.bats index d6980cb..fabc490 100755 --- a/src/test-clang.bats +++ b/src/test-clang.bats @@ -360,12 +360,12 @@ testBuildHello() { export TARGETARCH=arm64 xx-clang --setup-target-triple - [ -f /usr/bin/arm64-apple-macos10.16-clang ] - [ -f /usr/bin/arm64-apple-macos10.16-clang++ ] + [ -f /usr/bin/arm64-apple-macos11.0-clang ] + [ -f /usr/bin/arm64-apple-macos11.0-clang++ ] - run cat /usr/bin/arm64-apple-macos10.16.cfg + run cat /usr/bin/arm64-apple-macos11.0.cfg assert_success - assert_output "--target=arm64-apple-macos10.16 -fuse-ld=ld64 -isysroot /xx-sdk/MacOSX11.1.sdk -stdlib=libc++" + assert_output "--target=arm64-apple-macos11.0 -fuse-ld=ld64 -isysroot /xx-sdk/MacOSX11.1.sdk -stdlib=libc++" touch /usr/bin/ld64.signed chmod +x /usr/bin/ld64.signed @@ -373,23 +373,23 @@ testBuildHello() { clean xx-clang --setup-target-triple - [ -f /usr/bin/arm64-apple-macos10.16-clang ] - [ -f /usr/bin/arm64-apple-macos10.16-clang++ ] + [ -f /usr/bin/arm64-apple-macos11.0-clang ] + [ -f /usr/bin/arm64-apple-macos11.0-clang++ ] - run cat /usr/bin/arm64-apple-macos10.16.cfg + run cat /usr/bin/arm64-apple-macos11.0.cfg assert_success - assert_output "--target=arm64-apple-macos10.16 -fuse-ld=/usr/bin/ld64.signed -isysroot /xx-sdk/MacOSX11.1.sdk -stdlib=libc++" + assert_output "--target=arm64-apple-macos11.0 -fuse-ld=/usr/bin/ld64.signed -isysroot /xx-sdk/MacOSX11.1.sdk -stdlib=libc++" clean mkdir -p /xx-sdk/MacOSX11.2.sdk xx-clang --setup-target-triple - [ -f /usr/bin/arm64-apple-macos10.16-clang ] - [ -f /usr/bin/arm64-apple-macos10.16-clang++ ] + [ -f /usr/bin/arm64-apple-macos11.0-clang ] + [ -f /usr/bin/arm64-apple-macos11.0-clang++ ] - run cat /usr/bin/arm64-apple-macos10.16.cfg + run cat /usr/bin/arm64-apple-macos11.0.cfg assert_success - assert_output "--target=arm64-apple-macos10.16 -fuse-ld=/usr/bin/ld64.signed -isysroot /xx-sdk/MacOSX11.2.sdk -stdlib=libc++" + assert_output "--target=arm64-apple-macos11.0 -fuse-ld=/usr/bin/ld64.signed -isysroot /xx-sdk/MacOSX11.2.sdk -stdlib=libc++" rm -r /xx-sdk/MacOSX11.2.sdk rm /usr/bin/ld64.signed diff --git a/src/test-info-alpine.bats b/src/test-info-alpine.bats index 97812e3..30849c4 100755 --- a/src/test-info-alpine.bats +++ b/src/test-info-alpine.bats @@ -127,7 +127,7 @@ load 'assert' assert_equal "amd64" "$(TARGETPLATFORM=darwin/amd64 xx-info arch)" assert_equal "x86_64" "$(TARGETPLATFORM=darwin/amd64 xx-info march)" assert_equal "arm64" "$(TARGETPLATFORM=darwin/arm64 xx-info march)" - assert_equal "arm64-apple-macos10.16" "$(TARGETPLATFORM=darwin/arm64 xx-info triple)" + assert_equal "arm64-apple-macos11.0" "$(TARGETPLATFORM=darwin/arm64 xx-info triple)" assert_equal "x86_64-apple-macos10.15" "$(TARGETPLATFORM=darwin/amd64 MACOSX_VERSION_MIN=10.15 xx-info triple)" assert_equal "apple" "$(TARGETPLATFORM=darwin/amd64 xx-info vendor)" } diff --git a/src/xx-info b/src/xx-info index 0cecfd7..f8eaa5a 100755 --- a/src/xx-info +++ b/src/xx-info @@ -216,11 +216,16 @@ if [ "$TARGETARCH" = "arm" ] && [ -z "$TARGETVARIANT" ]; then TARGETVARIANT="v7" fi +# Default deployment targets for Darwin. +# +# Keep 10.6 for Intel. Apple Silicon starts at macOS 11; older toolchains +# used "10.16" as an alias for Big Sur, but newer Clang maps it to "11.0" +# and warns about the override. if [ "$TARGETOS" = "darwin" ] && [ -z "$MACOSX_VERSION_MIN" ]; then if [ "$TARGETARCH" = "amd64" ]; then MACOSX_VERSION_MIN=10.6 else - MACOSX_VERSION_MIN=10.16 + MACOSX_VERSION_MIN=11.0 fi fi