Skip to content

Commit 66d4665

Browse files
committed
Runtimes: hoist more flags from swiftCore to all Core libraries
Addresses rdar://143152066
1 parent 7924cc1 commit 66d4665

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Runtimes/Core/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,8 @@ add_link_options($<$<PLATFORM_ID:Windows>:LINKER:/WX>)
157157
add_compile_options(
158158
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-library-level api>"
159159
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-runtime-compatibility-version none>"
160+
"$<$<COMPILE_LANGUAGE:Swift>:-disable-autolinking-runtime-compatibility-dynamic-replacements>"
161+
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-autolinking-runtime-compatibility-concurrency>"
160162
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature NoncopyableGenerics2>"
161163
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature SuppressedAssociatedTypes>"
162164
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature SE427NoInferenceOnExtension>"
@@ -174,9 +176,11 @@ add_compile_options(
174176
# TODO: we should reevaluate if it still makes sense to restrict this
175177
# to Darwin, https://github.com/swiftlang/swift/issues/79279
176178
"$<$<AND:$<PLATFORM_ID:Darwin>,$<COMPILE_LANGUAGE:Swift>>:-save-optimization-record=bitstream>"
179+
"$<$<COMPILE_LANGUAGE:Swift>:-warn-implicit-overrides>"
177180
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -enable-lexical-lifetimes=false>"
178181
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-implicit-concurrency-module-import>"
179182
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-implicit-string-processing-module-import>"
183+
"$<$<COMPILE_LANGUAGE:Swift>:-no-link-objc-runtime>"
180184
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -enforce-exclusivity=unchecked>"
181185
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -enable-ossa-modules>"
182186
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -empty-abi-descriptor>"

Runtimes/Core/core/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -280,11 +280,7 @@ target_compile_options(swiftCore PRIVATE
280280
$<$<COMPILE_LANGUAGE:Swift>:-parse-stdlib>
281281
$<$<COMPILE_LANGUAGE:Swift>:-nostdimport>
282282
$<$<COMPILE_LANGUAGE:Swift>:-explicit-module-build>
283-
$<$<COMPILE_LANGUAGE:Swift>:-disable-autolinking-runtime-compatibility-dynamic-replacements>
284-
$<$<COMPILE_LANGUAGE:Swift>:-no-link-objc-runtime>
285-
$<$<COMPILE_LANGUAGE:Swift>:-warn-implicit-overrides>
286283
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -group-info-path -Xfrontend ${CMAKE_CURRENT_SOURCE_DIR}/GroupInfo.json>"
287-
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-autolinking-runtime-compatibility-concurrency>"
288284
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-objc-attr-requires-foundation-module>"
289285
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -require-explicit-availability=ignore>"
290286
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -prespecialize-generic-metadata>")

0 commit comments

Comments
 (0)