File tree Expand file tree Collapse file tree 2 files changed +24
-3
lines changed Expand file tree Collapse file tree 2 files changed +24
-3
lines changed Original file line number Diff line number Diff line change 67
67
set (_SWIFT_DEFINED_COMPONENTS
68
68
"autolink-driver;compiler;clang-builtin-headers;clang-resource-dir-symlink;clang-builtin-headers-in-clang-resource-dir;stdlib;stdlib-experimental;sdk-overlay;parser-lib;editor-integration;tools;testsuite-tools;toolchain-dev-tools;dev;license;sourcekit-xpc-service;sourcekit-inproc;swift-remote-mirror;swift-remote-mirror-headers" )
69
69
70
+ # The default install components include all of the defined components, except
71
+ # for the following exceptions.
72
+ set (_SWIFT_DEFAULT_COMPONENTS "${_SWIFT_DEFINED_COMPONENTS} " )
73
+ # 'dev' takes up a lot of disk space and isn't part of a normal toolchain.
74
+ list (REMOVE_ITEM _SWIFT_DEFAULT_COMPONENTS "dev" )
75
+ # These clang header options conflict with 'clang-builtin-headers'.
76
+ list (REMOVE_ITEM _SWIFT_DEFAULT_COMPONENTS "clang-resource-dir-symlink" )
77
+ list (REMOVE_ITEM _SWIFT_DEFAULT_COMPONENTS "clang-builtin-headers-in-clang-resource-dir" )
78
+ # The sourcekit install variants are currently mutually exclusive.
79
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" )
80
+ list (REMOVE_ITEM _SWIFT_DEFAULT_COMPONENTS "sourcekit-inproc" )
81
+ else ()
82
+ list (REMOVE_ITEM _SWIFT_DEFAULT_COMPONENTS "sourcekit-xpc-service" )
83
+ endif ()
84
+
70
85
macro (swift_configure_components )
71
86
# Set the SWIFT_INSTALL_COMPONENTS variable to the default value if it is not passed in via -D
72
- set (SWIFT_INSTALL_COMPONENTS "${_SWIFT_DEFINED_COMPONENTS } " CACHE STRING
73
- "A semicolon-separated list of components to install ${_SWIFT_DEFINED_COMPONENTS} " )
87
+ set (SWIFT_INSTALL_COMPONENTS "${_SWIFT_DEFAULT_COMPONENTS } " CACHE STRING
88
+ "A semicolon-separated list of components to install from the set ${_SWIFT_DEFINED_COMPONENTS} " )
74
89
75
90
foreach (component ${_SWIFT_DEFINED_COMPONENTS} )
76
91
string (TOUPPER "${component} " var_name_piece )
Original file line number Diff line number Diff line change @@ -2312,7 +2312,6 @@ for host in "${ALL_HOSTS[@]}"; do
2312
2312
-DSWIFT_BUILD_EXTERNAL_PERF_TESTSUITE:BOOL=$( true_false " ${build_external_perf_testsuite_this_time} " )
2313
2313
-DSWIFT_BUILD_EXAMPLES:BOOL=$( true_false " ${BUILD_SWIFT_EXAMPLES} " )
2314
2314
-DSWIFT_INCLUDE_TESTS:BOOL=$( true_false " ${build_tests_this_time} " )
2315
- -DSWIFT_INSTALL_COMPONENTS:STRING=" ${SWIFT_INSTALL_COMPONENTS} "
2316
2315
-DSWIFT_EMBED_BITCODE_SECTION:BOOL=$( true_false " ${EMBED_BITCODE_SECTION} " )
2317
2316
-DSWIFT_TOOLS_ENABLE_LTO:STRING=" ${SWIFT_TOOLS_ENABLE_LTO} "
2318
2317
-DSWIFT_BUILD_RUNTIME_WITH_HOST_COMPILER:BOOL=$( true_false " ${BUILD_RUNTIME_WITH_HOST_COMPILER} " )
@@ -2388,6 +2387,13 @@ for host in "${ALL_HOSTS[@]}"; do
2388
2387
)
2389
2388
fi
2390
2389
2390
+ if [ " ${SWIFT_INSTALL_COMPONENTS} " ] ; then
2391
+ cmake_options=(
2392
+ " ${cmake_options[@]} "
2393
+ -DSWIFT_INSTALL_COMPONENTS:STRING=" ${SWIFT_INSTALL_COMPONENTS} "
2394
+ )
2395
+ fi
2396
+
2391
2397
if contains_product " lldb" ; then
2392
2398
lldb_build_dir=$( build_directory ${host} lldb)
2393
2399
cmake_options=(
You can’t perform that action at this time.
0 commit comments