Skip to content

Commit f642519

Browse files
authored
Merge pull request swiftlang#77413 from etcwilde/ewilde/6.0-use-toolchain-clang-on-macos
[🍒 Swift 6.0.x] Use toolchain clang on macOS
2 parents 7616da0 + 1e76df7 commit f642519

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

utils/build-script-impl

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1670,8 +1670,11 @@ for host in "${ALL_HOSTS[@]}"; do
16701670
else
16711671
CLANG_BIN="$(build_directory_bin ${LOCAL_HOST} llvm)"
16721672
fi
1673-
export SWIFT_DRIVER_CLANG_EXEC="${CLANG_BIN}/clang"
1674-
export SWIFT_DRIVER_CLANGXX_EXEC="${CLANG_BIN}/clang++"
1673+
1674+
if [[ -f "${CLANG_BIN}/clang" ]] && [[ -z ${ENABLE_ASAN+x} ]]; then
1675+
export SWIFT_DRIVER_CLANG_EXEC="${CLANG_BIN}/clang"
1676+
export SWIFT_DRIVER_CLANGXX_EXEC="${CLANG_BIN}/clang++"
1677+
fi
16751678

16761679
if [[ "${NATIVE_SWIFT_TOOLS_PATH}" ]] ; then
16771680
SWIFTC_BIN="${NATIVE_SWIFT_TOOLS_PATH}/swiftc"
@@ -2782,8 +2785,11 @@ for host in "${ALL_HOSTS[@]}"; do
27822785
else
27832786
CLANG_BIN="$(build_directory_bin ${LOCAL_HOST} llvm)"
27842787
fi
2785-
export SWIFT_DRIVER_CLANG_EXEC="${CLANG_BIN}/clang"
2786-
export SWIFT_DRIVER_CLANGXX_EXEC="${CLANG_BIN}/clang++"
2788+
2789+
if [[ -f "${CLANG_BIN}/clang" ]] && [[ -z ${ENABLE_ASAN+x} ]]; then
2790+
export SWIFT_DRIVER_CLANG_EXEC="${CLANG_BIN}/clang"
2791+
export SWIFT_DRIVER_CLANGXX_EXEC="${CLANG_BIN}/clang++"
2792+
fi
27872793

27882794
if [[ "${NATIVE_SWIFT_TOOLS_PATH}" ]] ; then
27892795
SWIFTC_BIN="${NATIVE_SWIFT_TOOLS_PATH}/swiftc"
@@ -3074,8 +3080,11 @@ for host in "${ALL_HOSTS[@]}"; do
30743080
else
30753081
CLANG_BIN="$(build_directory_bin ${LOCAL_HOST} llvm)"
30763082
fi
3077-
export SWIFT_DRIVER_CLANG_EXEC="${CLANG_BIN}/clang"
3078-
export SWIFT_DRIVER_CLANGXX_EXEC="${CLANG_BIN}/clang++"
3083+
3084+
if [[ -f "${CLANG_BIN}/clang" ]] && [[ -z ${ENABLE_ASAN+x} ]]; then
3085+
export SWIFT_DRIVER_CLANG_EXEC="${CLANG_BIN}/clang"
3086+
export SWIFT_DRIVER_CLANGXX_EXEC="${CLANG_BIN}/clang++"
3087+
fi
30793088

30803089
# Set the build options for this host
30813090
set_build_options_for_host $host

0 commit comments

Comments
 (0)