Skip to content

Commit 2464989

Browse files
authored
Merge pull request #38238 from apple/revert-38154-pr38154
Revert "[CMake] Better dependency checking"
2 parents 8cd6206 + c030029 commit 2464989

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -512,8 +512,6 @@ message(STATUS "C Compiler (${CMAKE_C_COMPILER}) Version: ${CMAKE_C_COMPILER_VER
512512
message(STATUS "C++ Compiler (${CMAKE_CXX_COMPILER}) Version: ${CMAKE_CXX_COMPILER_VERSION}")
513513
if (CMAKE_Swift_COMPILER)
514514
message(STATUS "Swift Compiler (${CMAKE_Swift_COMPILER}) Version: ${CMAKE_Swift_COMPILER_VERSION}")
515-
elseif (SWIFT_BUILD_RUNTIME_WITH_HOST_COMPILER)
516-
message(FATAL_ERROR "Swift Compiler not found and SWIFT_BUILD_RUNTIME_WITH_HOST_COMPILER is set")
517515
else()
518516
message(STATUS "Swift Compiler (None).")
519517
endif()

stdlib/cmake/modules/SwiftSource.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ function(_compile_swift_files
643643
endif()
644644

645645
set(swift_compiler_tool_dep)
646-
if(SWIFT_INCLUDE_TOOLS AND NOT SWIFT_BUILD_RUNTIME_WITH_HOST_COMPILER)
646+
if(SWIFT_INCLUDE_TOOLS)
647647
# Depend on the binary itself, in addition to the symlink.
648648
set(swift_compiler_tool_dep "swift-frontend")
649649
endif()

0 commit comments

Comments
 (0)