Skip to content

Commit c138850

Browse files
committed
---
yaml --- r: 347130 b: refs/heads/master c: 3ec4b4e h: refs/heads/master
1 parent 88a1a86 commit c138850

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 08b6871abb38b002d9bcdea07361b1574323b468
2+
refs/heads/master: 3ec4b4e0f9ee04ea597afa0e46565c3ba91ba3d4
33
refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/cmake/modules/AddSwift.cmake

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1209,6 +1209,15 @@ function(_add_swift_library_single target name)
12091209
"${SWIFTLIB_SINGLE_FORCE_BUILD_OPTIMIZED_keyword}"
12101210
RESULT_VAR_NAME c_compile_flags
12111211
)
1212+
1213+
if(SWIFTLIB_IS_STDLIB)
1214+
# We don't ever want to link against the ABI-breakage checking symbols
1215+
# in the standard library, runtime, or overlays because they only rely
1216+
# on the header parts of LLVM's ADT.
1217+
list(APPEND c_compile_flags
1218+
"-DLLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING=1")
1219+
endif()
1220+
12121221
if(SWIFTLIB_SINGLE_SDK STREQUAL WINDOWS)
12131222
if(libkind STREQUAL SHARED)
12141223
list(APPEND c_compile_flags -D_WINDLL)

0 commit comments

Comments
 (0)