From fc06966d73058a5a7e3250b5cbfcc5478962c17f Mon Sep 17 00:00:00 2001 From: Eric Miotto <1094986+edymtt@users.noreply.github.com> Date: Tue, 5 Dec 2023 09:26:19 -0800 Subject: [PATCH] CMake: allow to build embedded stdlib in a standalone preset This would be needed to support Apple internal configurations. Addresses rdar://119192035 --- stdlib/public/CMakeLists.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/stdlib/public/CMakeLists.txt b/stdlib/public/CMakeLists.txt index 0efa50f99f32e..eab62de583ecf 100644 --- a/stdlib/public/CMakeLists.txt +++ b/stdlib/public/CMakeLists.txt @@ -138,12 +138,17 @@ option(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB "Enable build of the embedded Swift standard library and runtime" TRUE) +# Temporarily, by default only build embedded stdlib when building the compiler, to +# unblock CI jobs that run against old(er) toolchains. +option(SWIFT_ALLOW_BUILD_EMBEDDED_STDLIB_WITH_HOST_COMPILER + "Build embedded Swift standard library and runtime even + if we are not building our own compiler" + FALSE) + if((NOT SWIFT_HOST_VARIANT STREQUAL "macosx") AND (NOT SWIFT_HOST_VARIANT STREQUAL "linux")) set(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB FALSE) elseif(NOT SWIFT_INCLUDE_TOOLS) - # Temporarily, only build embedded stdlib when building the compiler, to - # unblock CI jobs that run against old(er) toolchains. - set(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB FALSE) + set(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB ${SWIFT_ALLOW_BUILD_EMBEDDED_STDLIB_WITH_HOST_COMPILER}) elseif(BOOTSTRAPPING_MODE STREQUAL "OFF") set(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB FALSE) endif()