Skip to content

[build-script-impl] Require --install-llvm to be passed in to install llvm. #32250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 9, 2020
Merged

[build-script-impl] Require --install-llvm to be passed in to install llvm. #32250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions utils/build-presets.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ build-ninja

build-swift-stdlib-unittest-extra

install-llvm
install-swift

# Path to the root of the installation filesystem.
Expand Down Expand Up @@ -391,6 +392,7 @@ skip-test-ios
skip-test-tvos
skip-test-watchos

install-llvm
install-swift
install-llbuild
install-swiftpm
Expand Down Expand Up @@ -602,6 +604,7 @@ llbuild
swiftpm
indexstore-db
sourcekit-lsp
install-llvm
install-swift
install-llbuild
install-swiftpm
Expand Down Expand Up @@ -790,6 +793,7 @@ libcxx
dash-dash

build-ninja
install-llvm
install-swift
install-lldb
install-llbuild
Expand Down Expand Up @@ -908,6 +912,7 @@ host-test
extra-cmake-options=-DSWIFT_ENABLE_LLD_LINKER:BOOL=OFF

install-prefix=/usr
install-llvm
install-swift
install-libicu
install-libcxx
Expand Down Expand Up @@ -1016,6 +1021,7 @@ build-subdir=buildbot_linux

dash-dash

install-llvm
install-swift
install-lldb
install-llbuild
Expand Down Expand Up @@ -1076,6 +1082,7 @@ indexstore-db
sourcekit-lsp
dash-dash

install-llvm
install-swift
install-llbuild
install-libicu
Expand Down Expand Up @@ -1117,6 +1124,7 @@ build-subdir=buildbot_incremental_tsan_libdispatch_test

llvm-cmake-options=-DLLVM_INSTALL_UTILS=ON
llvm-install-components=all
install-llvm

libdispatch-cmake-options=-DENABLE_SWIFT=OFF
libdispatch
Expand Down Expand Up @@ -1208,6 +1216,7 @@ verbose-build
build-ninja
build-swift-stdlib-unittest-extra

install-llvm
install-swift
install-lldb
install-llbuild
Expand Down Expand Up @@ -1433,6 +1442,7 @@ build-swift-stdlib-unittest-extra
libcxx

# Install swift and libcxx
install-llvm
install-swift
install-libcxx

Expand Down Expand Up @@ -1481,6 +1491,7 @@ swiftsyntax-verify-generated-files
# Build sourcekit-lsp & indexstore-db
indexstore-db
sourcekit-lsp
install-llvm
install-swift
install-llbuild
install-swiftpm
Expand Down Expand Up @@ -1547,6 +1558,7 @@ libcxx
llbuild
swiftpm

install-llvm
install-swift
install-llbuild
install-swiftpm
Expand Down Expand Up @@ -1793,6 +1805,7 @@ install-foundation
install-libdispatch
install-libicu
install-libcxx
install-llvm
install-swift
install-llbuild
install-swiftpm
Expand Down Expand Up @@ -1828,6 +1841,7 @@ skip-build-cmark
skip-build-llvm
skip-build-llbuild
skip-build-benchmarks
install-llvm
install-swift
install-prefix=%(install_toolchain_dir)s/usr
build-swift-examples=0
Expand Down Expand Up @@ -2245,6 +2259,7 @@ no-assertions
build-libparser-only
verbose-build
darwin-install-extract-symbols
install-llvm
install-swift


Expand Down Expand Up @@ -2338,6 +2353,7 @@ build-ninja
llbuild
swiftpm
install-llbuild
install-llvm
install-swift
install-swiftpm
reconfigure
Expand Down
7 changes: 4 additions & 3 deletions utils/build-script-impl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2656,12 +2656,13 @@ for host in "${ALL_HOSTS[@]}"; do
fi
;;
llvm)
if [[ -z "${LLVM_INSTALL_COMPONENTS}" ]] ; then
if [[ -z "${INSTALL_LLVM}" ]] ; then
continue
fi
if [[ "${LLVM_INSTALL_COMPONENTS}" == "all" ]]; then

if [[ "${LLVM_INSTALL_COMPONENTS}" == "all" ]] ; then
INSTALL_TARGETS=install
else
elif [[ -n "${LLVM_INSTALL_COMPONENTS}" ]] ; then
INSTALL_TARGETS=install-$(echo ${LLVM_INSTALL_COMPONENTS} | sed -E 's/;/ install-/g')
fi
;;
Expand Down