---

yaml
---
r: 349459
b: refs/heads/master-next
c: 712b24f
h: refs/heads/master
i:
  349457: 26e592a
  349455: e2bd467

Author: swift-ci

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
-refs/heads/master-next: f2c980c9093d3fa0a040ca8f45a23a346c6b8fb5
+refs/heads/master-next: 712b24f69a564d92b5abe944503132b2475c78ed
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/stdlib/toolchain/CMakeLists.txt

@@ -41,6 +41,18 @@ if("Thread" IN_LIST SWIFT_RUNTIME_USE_SANITIZERS)
   list(APPEND CXX_LINK_FLAGS "-fsanitize=thread")
 endif()
 
+# Do not enforce checks for LLVM's ABI-breaking build settings.
+# The Swift runtime uses some header-only code from LLVM's ADT classes,
+# but we do not want to link libSupport into the runtime. These checks rely
+# on the presence of symbols in libSupport to identify how the code was
+# built and cause link failures for mismatches. Without linking that library,
+# we get link failures regardless, so instead, this just disables the checks.
+if(CMAKE_VERSION VERSION_LESS 3.12)
+  append("-DLLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING=1" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
+else()
+  add_compile_definitions(LLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING=1)
+endif()
+
 
 add_subdirectory(legacy_layouts)
 add_subdirectory(Compatibility50)