---

yaml
---
r: 346858
b: refs/heads/master
c: 49a1e7c
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 15035bfa9cbabee863437e3a96b6a9ad99217028
+refs/heads/master: 49a1e7c668a22b8aac46c4e93f8a08747db4c8af
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/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)
 

trunk/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

trunk/stdlib/public/CMakeLists.txt

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