---

yaml
---
r: 318391
b: refs/heads/master-rebranch
c: 49a1e7c
h: refs/heads/master
i:
  318389: 85571fc
  318387: 1279d43
  318383: 8406efe

Author: swift-ci

[refs]

@@ -1457,4 +1457,4 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
 refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
 refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
-refs/heads/master-rebranch: 15035bfa9cbabee863437e3a96b6a9ad99217028
+refs/heads/master-rebranch: 49a1e7c668a22b8aac46c4e93f8a08747db4c8af

branches/master-rebranch/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)
 

branches/master-rebranch/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

branches/master-rebranch/stdlib/public/CMakeLists.txt

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