Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/test-clang.bats
Original file line number Diff line number Diff line change
Expand Up @@ -360,36 +360,36 @@ 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

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
Expand Down
2 changes: 1 addition & 1 deletion src/test-info-alpine.bats
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
}
Expand Down
7 changes: 6 additions & 1 deletion src/xx-info
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading