Skip to content

Commit 9010c1b

Browse files
authored
Merge pull request #33760 from gottesmm/pr-1d2143f460a9d74a60af3be92d03f404a9cde805
Revert "build-script: remove dead CMake options for Swift"
2 parents 36fe811 + c8d4d16 commit 9010c1b

File tree

1 file changed

+23
-0
lines changed

1 file changed

+23
-0
lines changed

utils/build-script-impl

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1625,6 +1625,12 @@ for host in "${ALL_HOSTS[@]}"; do
16251625
-DLLVM_ENABLE_PROJECTS="$(join ";" ${llvm_enable_projects[@]})"
16261626
)
16271627

1628+
# NOTE: This is not a dead option! It is relied upon for certain
1629+
# bots/build-configs!
1630+
#
1631+
# TODO: In the future when we are always cross compiling and
1632+
# using Toolchain files, we should put this in either a
1633+
# toolchain file or a cmake cache.
16281634
if [[ "${BUILD_TOOLCHAIN_ONLY}" ]]; then
16291635
cmake_options+=(
16301636
-DLLVM_BUILD_TOOLS=NO
@@ -1802,6 +1808,23 @@ for host in "${ALL_HOSTS[@]}"; do
18021808
"${swift_cmake_options[@]}"
18031809
)
18041810

1811+
if [[ "${BUILD_TOOLCHAIN_ONLY}" ]]; then
1812+
cmake_options+=(
1813+
-DSWIFT_TOOL_SIL_OPT_BUILD=FALSE
1814+
-DSWIFT_TOOL_SWIFT_IDE_TEST_BUILD=FALSE
1815+
-DSWIFT_TOOL_SWIFT_REMOTEAST_TEST_BUILD=FALSE
1816+
-DSWIFT_TOOL_LLDB_MODULEIMPORT_TEST_BUILD=FALSE
1817+
-DSWIFT_TOOL_SIL_EXTRACT_BUILD=FALSE
1818+
-DSWIFT_TOOL_SWIFT_LLVM_OPT_BUILD=FALSE
1819+
-DSWIFT_TOOL_SWIFT_SDK_ANALYZER_BUILD=FALSE
1820+
-DSWIFT_TOOL_SWIFT_SDK_DIGESTER_BUILD=FALSE
1821+
-DSWIFT_TOOL_SOURCEKITD_TEST_BUILD=FALSE
1822+
-DSWIFT_TOOL_SOURCEKITD_REPL_BUILD=FALSE
1823+
-DSWIFT_TOOL_COMPLETE_TEST_BUILD=FALSE
1824+
-DSWIFT_TOOL_SWIFT_REFLECTION_DUMP_BUILD=FALSE
1825+
)
1826+
fi
1827+
18051828
cmake_options=(
18061829
"${cmake_options[@]}"
18071830
-DCMAKE_INSTALL_PREFIX:PATH="$(get_host_install_prefix ${host})"

0 commit comments

Comments
 (0)