Skip to content

Commit ef18fb0

Browse files
authored
Merge pull request swiftlang#69217 from kubamracek/embedded-stdlib-build-option
[embedded] Don't gate embedded stdlib build behind SWIFT_BUILD_STDLIB
2 parents 64cd96e + 6da4a05 commit ef18fb0

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

stdlib/public/CMakeLists.txt

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -134,16 +134,19 @@ if(SWIFT_BUILD_STDLIB OR SWIFT_BUILD_REMOTE_MIRROR)
134134
INSTALL_IN_COMPONENT never_install)
135135
endif()
136136

137-
if(SWIFT_BUILD_STDLIB)
138-
set(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB TRUE)
139-
if(NOT SWIFT_HOST_VARIANT STREQUAL "macosx")
140-
set(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB FALSE)
141-
elseif(NOT SWIFT_INCLUDE_TOOLS)
142-
# Temporarily, only build embedded stdlib when building the compiler, to
143-
# unblock CI jobs that run against old(er) toolchains.
144-
set(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB FALSE)
145-
endif()
137+
option(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB
138+
"Enable build of the embedded Swift standard library and runtime"
139+
TRUE)
140+
141+
if(NOT SWIFT_HOST_VARIANT STREQUAL "macosx")
142+
set(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB FALSE)
143+
elseif(NOT SWIFT_INCLUDE_TOOLS)
144+
# Temporarily, only build embedded stdlib when building the compiler, to
145+
# unblock CI jobs that run against old(er) toolchains.
146+
set(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB FALSE)
147+
endif()
146148

149+
if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
147150
set(EMBEDDED_STDLIB_TARGET_TRIPLES
148151
# arch module_name target triple
149152
"armv7 armv7-apple-none-macho armv7-apple-none-macho"

0 commit comments

Comments
 (0)