---

yaml
---
r: 346707
b: refs/heads/master
c: e5880f6
h: refs/heads/master
i:
  346705: e5cf588
  346703: b50c075

Author: bob-wilson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 3aa15a376a41476a4bad0b8b13696c944494041c
+refs/heads/master: e5880f622c252e2f5b9bd845046384070f187be9
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/SwiftDemangle/CMakeLists.txt

@@ -7,14 +7,6 @@ add_swift_host_library(swiftDemangle
                   C_COMPILE_FLAGS
                     -DLLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING=1)
 
-# Do not enforce checks for LLVM's ABI-breaking build settings.
-# The demangler uses some header-only code from LLVM's ADT classes,
-# but we do not want to link libSupport into the demangler. 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.
-append("-DLLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING=1" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
-
 swift_install_in_component(compiler
     TARGETS swiftDemangle
     LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}"