@@ -1670,8 +1670,11 @@ for host in "${ALL_HOSTS[@]}"; do
1670
1670
else
1671
1671
CLANG_BIN=" $( build_directory_bin ${LOCAL_HOST} llvm) "
1672
1672
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
1675
1678
1676
1679
if [[ " ${NATIVE_SWIFT_TOOLS_PATH} " ]] ; then
1677
1680
SWIFTC_BIN=" ${NATIVE_SWIFT_TOOLS_PATH} /swiftc"
@@ -2782,8 +2785,11 @@ for host in "${ALL_HOSTS[@]}"; do
2782
2785
else
2783
2786
CLANG_BIN=" $( build_directory_bin ${LOCAL_HOST} llvm) "
2784
2787
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
2787
2793
2788
2794
if [[ " ${NATIVE_SWIFT_TOOLS_PATH} " ]] ; then
2789
2795
SWIFTC_BIN=" ${NATIVE_SWIFT_TOOLS_PATH} /swiftc"
@@ -3074,8 +3080,11 @@ for host in "${ALL_HOSTS[@]}"; do
3074
3080
else
3075
3081
CLANG_BIN=" $( build_directory_bin ${LOCAL_HOST} llvm) "
3076
3082
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
3079
3088
3080
3089
# Set the build options for this host
3081
3090
set_build_options_for_host $host
0 commit comments