Skip to content

Commit def22dc

Browse files
committed
Revert " [runtime] unittests should use just-built compiler if the runtime did"
This seems to be causing issues with the ASAN bot. And I don't think this was actually causing issues in the tests. rdar://73664504
1 parent 7060aef commit def22dc

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

unittests/runtime/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@ if(("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SDK}") AND
22
("${SWIFT_HOST_VARIANT_ARCH}" STREQUAL "${SWIFT_PRIMARY_VARIANT_ARCH}"))
33

44
if("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
5-
if(NOT SWIFT_BUILD_RUNTIME_WITH_HOST_COMPILER)
6-
set(CMAKE_CXX_COMPILER "${SWIFT_NATIVE_CLANG_TOOLS_PATH}/clang++")
7-
set(CMAKE_C_COMPILER "${SWIFT_NATIVE_CLANG_TOOLS_PATH}/clang")
8-
endif()
5+
# Do nothing
96
elseif(SWIFT_BUILD_RUNTIME_WITH_HOST_COMPILER)
107
if(NOT "${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
118
message(FATAL_ERROR "Building the swift runtime is not supported with ${CMAKE_C_COMPILER_ID}. Use the just-built clang instead.")

0 commit comments

Comments
 (0)