Skip to content

Commit a0538ae

Browse files
committed
Revert "CMake: Runtimes: Specify language mode explicitly."
Reverting since we can use `CMAKE_Swift_LANGUAGE_VERSION` instead. This reverts commit 6cc9a7d.
1 parent cd2a7b3 commit a0538ae

File tree

8 files changed

+0
-8
lines changed

8 files changed

+0
-8
lines changed

Runtimes/Core/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@ add_link_options($<$<PLATFORM_ID:Linux>:LINKER:-z,defs>)
181181
add_compile_options(
182182
$<$<COMPILE_LANGUAGE:Swift>:-explicit-module-build>
183183
"$<$<COMPILE_LANGUAGE:Swift>:-nostdlibimport>"
184-
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-swift-version 5>"
185184
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-library-level api>"
186185
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-runtime-compatibility-version none>"
187186
"$<$<COMPILE_LANGUAGE:Swift>:-disable-autolinking-runtime-compatibility-dynamic-replacements>"

Runtimes/Overlay/Cxx/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ target_compile_options(swiftCxx PRIVATE
3131
# This module should not pull in the C++ standard library, so we disable it
3232
# explicitly. For functionality that depends on the C++ stdlib, use C++
3333
# stdlib overlay (`swiftstd` module).
34-
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-swift-version 5>"
3534
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xcc -nostdinc++>"
3635
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature AllowUnsafeAttribute>"
3736
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature BuiltinModule>"

Runtimes/Supplemental/Differentiation/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ add_compile_options(
6666
$<$<COMPILE_LANGUAGE:Swift>:-explicit-module-build>
6767
$<$<COMPILE_LANGUAGE:Swift>:-nostdlibimport>
6868
$<$<COMPILE_LANGUAGE:Swift>:-parse-stdlib>
69-
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-swift-version 5>"
7069
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-library-level api>"
7170
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature NoncopyableGenerics2>"
7271
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature SuppressedAssociatedTypes>"

Runtimes/Supplemental/Distributed/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ add_compile_options(
6969
$<$<COMPILE_LANGUAGE:Swift>:-explicit-module-build>
7070
$<$<COMPILE_LANGUAGE:Swift>:-nostdlibimport>
7171
$<$<COMPILE_LANGUAGE:Swift>:-strict-memory-safety>
72-
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-swift-version 5>"
7372
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature NoncopyableGenerics2>"
7473
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature SuppressedAssociatedTypes>"
7574
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature SE427NoInferenceOnExtension>"

Runtimes/Supplemental/Observation/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ option(${PROJECT_NAME}_ENABLE_PRESPECIALIZATION "Enable generic metadata prespec
6464
add_compile_options(
6565
$<$<COMPILE_LANGUAGE:Swift>:-explicit-module-build>
6666
$<$<COMPILE_LANGUAGE:Swift>:-nostdlibimport>
67-
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-swift-version 5>"
6867
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -enforce-exclusivity=unchecked>"
6968
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -target-min-inlining-version -Xfrontend min>"
7069
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-implicit-string-processing-module-import>"

Runtimes/Supplemental/StringProcessing/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ option(${PROJECT_NAME}_ENABLE_PRESPECIALIZATION "Enable generic metadata prespec
5353
add_compile_options(
5454
$<$<COMPILE_LANGUAGE:Swift>:-explicit-module-build>
5555
$<$<COMPILE_LANGUAGE:Swift>:-nostdlibimport>
56-
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-swift-version 5>"
5756
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-implicit-concurrency-module-import>"
5857
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-implicit-string-processing-module-import>"
5958
"$<$<COMPILE_LANGUAGE:Swift>:-warn-implicit-overrides>"

Runtimes/Supplemental/Synchronization/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ add_compile_options(
7272
$<$<COMPILE_LANGUAGE:Swift>:-nostdlibimport>
7373
$<$<COMPILE_LANGUAGE:Swift>:-enable-builtin-module>
7474
$<$<COMPILE_LANGUAGE:Swift>:-strict-memory-safety>
75-
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-swift-version 5>"
7675
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature NoncopyableGenerics2>"
7776
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature SuppressedAssociatedTypes>"
7877
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature SE427NoInferenceOnExtension>"

Runtimes/Supplemental/Volatile/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ add_compile_options(
6767
$<$<COMPILE_LANGUAGE:Swift>:-explicit-module-build>
6868
$<$<COMPILE_LANGUAGE:Swift>:-nostdlibimport>
6969
$<$<COMPILE_LANGUAGE:Swift>:-strict-memory-safety>
70-
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-swift-version 5>"
7170
"$<$<AND:$<BOOL:${${PROJECT_NAME}_ENABLE_LIBRARY_EVOLUTION}>,$<COMPILE_LANGUAGE:Swift>>:-enable-library-evolution>"
7271
"$<$<AND:$<BOOL:${${PROJECT_NAME}_ENABLE_PRESPECIALIZATION}>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-Xfrontend -prespecialize-generic-metadata>")
7372

0 commit comments

Comments
 (0)