Skip to content

Commit 653372a

Browse files
authored
Merge pull request #73862 from etcwilde/ewilde/set-clang-linker-if-we-have-clang
Only set clang linker if it exists
2 parents b5cc561 + e0f81da commit 653372a

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
@@ -1653,8 +1653,11 @@ for host in "${ALL_HOSTS[@]}"; do
16531653
else
16541654
CLANG_BIN="$(build_directory_bin ${LOCAL_HOST} llvm)"
16551655
fi
1656-
export SWIFT_DRIVER_CLANG_EXEC="${CLANG_BIN}/clang"
1657-
export SWIFT_DRIVER_CLANGXX_EXEC="${CLANG_BIN}/clang++"
1656+
1657+
if [[ -f "${CLANG_BIN}/clang" ]]; then
1658+
export SWIFT_DRIVER_CLANG_EXEC="${CLANG_BIN}/clang"
1659+
export SWIFT_DRIVER_CLANGXX_EXEC="${CLANG_BIN}/clang++"
1660+
fi
16581661

16591662
if [[ "${NATIVE_SWIFT_TOOLS_PATH}" ]] ; then
16601663
SWIFTC_BIN="${NATIVE_SWIFT_TOOLS_PATH}/swiftc"
@@ -2722,8 +2725,11 @@ for host in "${ALL_HOSTS[@]}"; do
27222725
else
27232726
CLANG_BIN="$(build_directory_bin ${LOCAL_HOST} llvm)"
27242727
fi
2725-
export SWIFT_DRIVER_CLANG_EXEC="${CLANG_BIN}/clang"
2726-
export SWIFT_DRIVER_CLANGXX_EXEC="${CLANG_BIN}/clang++"
2728+
2729+
if [[ -f "${CLANG_BIN}/clang" ]]; then
2730+
export SWIFT_DRIVER_CLANG_EXEC="${CLANG_BIN}/clang"
2731+
export SWIFT_DRIVER_CLANGXX_EXEC="${CLANG_BIN}/clang++"
2732+
fi
27272733

27282734
if [[ "${NATIVE_SWIFT_TOOLS_PATH}" ]] ; then
27292735
SWIFTC_BIN="${NATIVE_SWIFT_TOOLS_PATH}/swiftc"
@@ -3082,8 +3088,11 @@ for host in "${ALL_HOSTS[@]}"; do
30823088
else
30833089
CLANG_BIN="$(build_directory_bin ${LOCAL_HOST} llvm)"
30843090
fi
3085-
export SWIFT_DRIVER_CLANG_EXEC="${CLANG_BIN}/clang"
3086-
export SWIFT_DRIVER_CLANGXX_EXEC="${CLANG_BIN}/clang++"
3091+
3092+
if [[ -f "${CLANG_BIN}/clang" ]]; then
3093+
export SWIFT_DRIVER_CLANG_EXEC="${CLANG_BIN}/clang"
3094+
export SWIFT_DRIVER_CLANGXX_EXEC="${CLANG_BIN}/clang++"
3095+
fi
30873096

30883097
# Set the build options for this host
30893098
set_build_options_for_host $host

0 commit comments

Comments
 (0)