Skip to content

Commit e7e4c14

Browse files
authored
Merge pull request #68602 from kubamracek/embedded-only-with-toolchain-for-now
[embedded] To unblock failing CI jobs, only build the embedded stdlib when building the compiler for now
2 parents 841f015 + 5616368 commit e7e4c14

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

stdlib/public/core/CMakeLists.txt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,15 @@ add_swift_target_library(swiftCore
385385
#
386386
# For now, we build a hardcoded list of target triples of the embedded stdlib,
387387
# and only when building Swift on macOS.
388-
if(SWIFT_HOST_VARIANT STREQUAL "macosx")
388+
set(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB TRUE)
389+
if(NOT SWIFT_HOST_VARIANT STREQUAL "macosx")
390+
set(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB FALSE)
391+
elseif(NOT SWIFT_INCLUDE_TOOLS)
392+
# Temporarily, only build embedded stdlib when building the compiler, to
393+
# unblock CI jobs that run against old(er) toolchains.
394+
set(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB FALSE)
395+
endif()
396+
if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
389397
add_custom_target(embedded-stdlib ALL)
390398
set(EMBEDDED_STDLIB_TARGET_TRIPLES
391399
# arch module_name target triple

0 commit comments

Comments
 (0)