Skip to content

Stop installing obsolete swift-build-tool executable #84364

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −7
Open

Stop installing obsolete swift-build-tool executable #84364

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
8 changes: 4 additions & 4 deletions utils/build-script-impl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2892,10 +2892,10 @@ for host in "${ALL_HOSTS[@]}"; do
INSTALL_TARGETS=install-swift-components
;;
llbuild)
if [[ -z "${INSTALL_LLBUILD}" ]] ; then
continue
fi
INSTALL_TARGETS="install-swift-build-tool"
# The llbuild built by build-script impl is tested and is used
# to bootstrap SwiftPM, but doesn't install any toolchain
# content
continue
;;
# Products from this here install themselves; they don't fall-through.
lldb)
Expand Down
1 change: 0 additions & 1 deletion validation-test/BuildSystem/infer_dumps_deps_if_verbose_build.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
# CHECK: --- Installing cmark ---
# CHECK: --- Installing llvm ---
# CHECK: --- Installing swift ---
# CHECK: --- Installing llbuild ---

# Then make sure we are installing/building SwiftPM last.
#
Expand Down
1 change: 0 additions & 1 deletion validation-test/BuildSystem/infer_implies_install_all.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,5 @@
# CHECK: --- Installing cmark ---
# CHECK: --- Installing llvm ---
# CHECK: --- Installing swift ---
# CHECK: --- Installing llbuild ---
# CHECK: --- Building swiftpm ---
# CHECK: --- Installing swiftpm ---
1 change: 0 additions & 1 deletion validation-test/BuildSystem/install_all_linux.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
# CHECK-DAG: --- Installing cmark ---
# CHECK-DAG: --- Installing swift ---
# CHECK-DAG: --- Installing llvm ---
# CHECK-DAG: --- Installing llbuild ---
# CHECK-DAG: --- Installing foundation ---
# CHECK-DAG: --- Installing libdispatch ---
# CHECK-DAG: --- Installing swiftpm ---