Skip to content

Commit 80b6b3a

Browse files
committed
Conditionalize libc++ installation
1 parent 5cdc15b commit 80b6b3a

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

utils/build-presets.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -730,6 +730,7 @@ install-libicu
730730
install-prefix=/usr
731731
swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;swift-remote-mirror;sdk-overlay;parser-lib;license;sourcekit-inproc
732732
llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt;clangd
733+
install-libcxx
733734
build-swift-static-stdlib
734735
build-swift-static-sdk-overlay
735736
build-swift-stdlib-unittest-extra
@@ -1082,6 +1083,7 @@ reconfigure
10821083

10831084
swift-install-components=compiler;clang-resource-dir-symlink;stdlib;sdk-overlay;parser-lib;license;sourcekit-xpc-service;swift-remote-mirror;swift-remote-mirror-headers
10841085
llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt;clangd
1086+
install-libcxx
10851087

10861088
# Path to the .tar.gz package we would create.
10871089
installable-package=%(installable_package)s

utils/build-script-impl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ KNOWN_SETTINGS=(
207207
install-swiftevolve "" "whether to install the swift-evolve tool"
208208
install-xctest "" "whether to install xctest"
209209
install-foundation "" "whether to install foundation"
210+
install-libcxx "" "whether to install libc++"
210211
install-libdispatch "" "whether to install libdispatch"
211212
install-libicu "" "whether to install libicu"
212213
install-playgroundsupport "" "whether to install PlaygroundSupport"
@@ -3504,6 +3505,9 @@ for host in "${ALL_HOSTS[@]}"; do
35043505
INSTALL_TARGETS=install-$(echo ${LLVM_INSTALL_COMPONENTS} | sed -E 's/;/ install-/g')
35053506
;;
35063507
libcxx)
3508+
if [[ -z "${INSTALL_LIBCXX}" ]] ; then
3509+
continue
3510+
fi
35073511
INSTALL_TARGETS=install-cxx-headers
35083512
;;
35093513
swift)

0 commit comments

Comments
 (0)