File tree Expand file tree Collapse file tree 2 files changed +6
-0
lines changed Expand file tree Collapse file tree 2 files changed +6
-0
lines changed Original file line number Diff line number Diff line change @@ -730,6 +730,7 @@ install-libicu
730
730
install-prefix =/usr
731
731
swift-install-components =autolink-driver; compiler;clang-resource-dir-symlink;stdlib;swift-remote-mirror;sdk-overlay;parser-lib;license;sourcekit-inproc
732
732
llvm-install-components =llvm-cov; llvm-profdata;IndexStore;clang;clang-headers;compiler-rt;clangd
733
+ install-libcxx
733
734
build-swift-static-stdlib
734
735
build-swift-static-sdk-overlay
735
736
build-swift-stdlib-unittest-extra
@@ -1082,6 +1083,7 @@ reconfigure
1082
1083
1083
1084
swift-install-components =compiler; clang-resource-dir-symlink;stdlib;sdk-overlay;parser-lib;license;sourcekit-xpc-service;swift-remote-mirror;swift-remote-mirror-headers
1084
1085
llvm-install-components =llvm-cov; llvm-profdata;IndexStore;clang;clang-headers;compiler-rt;clangd
1086
+ install-libcxx
1085
1087
1086
1088
# Path to the .tar.gz package we would create.
1087
1089
installable-package =%(installable_package)s
Original file line number Diff line number Diff line change @@ -207,6 +207,7 @@ KNOWN_SETTINGS=(
207
207
install-swiftevolve " " " whether to install the swift-evolve tool"
208
208
install-xctest " " " whether to install xctest"
209
209
install-foundation " " " whether to install foundation"
210
+ install-libcxx " " " whether to install libc++"
210
211
install-libdispatch " " " whether to install libdispatch"
211
212
install-libicu " " " whether to install libicu"
212
213
install-playgroundsupport " " " whether to install PlaygroundSupport"
@@ -3504,6 +3505,9 @@ for host in "${ALL_HOSTS[@]}"; do
3504
3505
INSTALL_TARGETS=install-$( echo ${LLVM_INSTALL_COMPONENTS} | sed -E ' s/;/ install-/g' )
3505
3506
;;
3506
3507
libcxx)
3508
+ if [[ -z " ${INSTALL_LIBCXX} " ]] ; then
3509
+ continue
3510
+ fi
3507
3511
INSTALL_TARGETS=install-cxx-headers
3508
3512
;;
3509
3513
swift)
You can’t perform that action at this time.
0 commit comments