Skip to content

Commit c8d4d16

Browse files
committed
Revert "build-script: remove dead CMake options for Swift"
This reverts commit 95102bc. This is actually a dead option that is relied upon for some configurations. I am going to add a note to not touch the option. I talked with compnerd about this and they are cool with this. I think that we can redo this in a nicer way when we are further into the build-script-impl refactoring. I added a note to the code to explain that it isn't dead.
1 parent bf7c03b commit c8d4d16

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
@@ -1623,6 +1623,12 @@ for host in "${ALL_HOSTS[@]}"; do
16231623
-DLLVM_ENABLE_PROJECTS="$(join ";" ${llvm_enable_projects[@]})"
16241624
)
16251625

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

1806+
if [[ "${BUILD_TOOLCHAIN_ONLY}" ]]; then
1807+
cmake_options+=(
1808+
-DSWIFT_TOOL_SIL_OPT_BUILD=FALSE
1809+
-DSWIFT_TOOL_SWIFT_IDE_TEST_BUILD=FALSE
1810+
-DSWIFT_TOOL_SWIFT_REMOTEAST_TEST_BUILD=FALSE
1811+
-DSWIFT_TOOL_LLDB_MODULEIMPORT_TEST_BUILD=FALSE
1812+
-DSWIFT_TOOL_SIL_EXTRACT_BUILD=FALSE
1813+
-DSWIFT_TOOL_SWIFT_LLVM_OPT_BUILD=FALSE
1814+
-DSWIFT_TOOL_SWIFT_SDK_ANALYZER_BUILD=FALSE
1815+
-DSWIFT_TOOL_SWIFT_SDK_DIGESTER_BUILD=FALSE
1816+
-DSWIFT_TOOL_SOURCEKITD_TEST_BUILD=FALSE
1817+
-DSWIFT_TOOL_SOURCEKITD_REPL_BUILD=FALSE
1818+
-DSWIFT_TOOL_COMPLETE_TEST_BUILD=FALSE
1819+
-DSWIFT_TOOL_SWIFT_REFLECTION_DUMP_BUILD=FALSE
1820+
)
1821+
fi
1822+
18001823
cmake_options=(
18011824
"${cmake_options[@]}"
18021825
-DCMAKE_INSTALL_PREFIX:PATH="$(get_host_install_prefix ${host})"

0 commit comments

Comments
 (0)