Merge pull request #22600 from compnerd/build-sweep

Author: swift-ci

cmake/modules/SwiftSharedCMakeConfig.cmake

@@ -1,6 +1,8 @@
 include(CMakeParseArguments)
 include(SwiftXcodeSupport)
 
+include(CheckCXXCompilerFlag)
+
 macro(swift_common_standalone_build_config_llvm product is_cross_compiling)
   option(LLVM_ENABLE_WARNINGS "Enable compiler warnings." ON)
 

stdlib/CMakeLists.txt

@@ -13,8 +13,7 @@ set(HOST_CMAKE_CXX_COMPILER ${CMAKE_CXX_COMPILER})
 set(HOST_CMAKE_C_COMPILER_INITIAL ${CMAKE_C_COMPILER})
 
 if(SWIFT_BUILD_RUNTIME_WITH_HOST_COMPILER)
-  if((NOT "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") AND
-     (NOT "${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang"))
+  if(NOT "${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
     message(FATAL_ERROR "Building the swift runtime is not supported with ${CMAKE_C_COMPILER_ID}. Use the just-built clang instead.")
   else()
     message(WARNING "Building the swift runtime using the host compiler, and not the just-built clang.")
@@ -32,6 +31,7 @@ else()
 
   set(CMAKE_C_COMPILER_LAUNCHER "")
   set(CMAKE_CXX_COMPILER_LAUNCHER "")
+
   # The sanitizers require using the same version of the compiler for
   # everything and there are various places where we link runtime code with
   # code built by the host compiler. Disable sanitizers for the runtime for

stdlib/public/CMakeLists.txt

@@ -1,3 +1,4 @@
+
 set(SWIFT_RUNTIME_CXX_FLAGS)
 set(SWIFT_RUNTIME_LINK_FLAGS)
 set(SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS)