From f04ed6f8c493789fd4c1525d83c816797787435b Mon Sep 17 00:00:00 2001 From: Owen Voorhees Date: Wed, 17 Sep 2025 17:08:10 -0700 Subject: [PATCH] Stop installing swift-build-tool --- utils/build-script-impl | 8 ++++---- .../BuildSystem/infer_dumps_deps_if_verbose_build.test | 1 - .../BuildSystem/infer_implies_install_all.test | 1 - validation-test/BuildSystem/install_all_linux.test | 1 - 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/utils/build-script-impl b/utils/build-script-impl index 3ebf7b45a4541..da972091e5b85 100755 --- a/utils/build-script-impl +++ b/utils/build-script-impl @@ -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) diff --git a/validation-test/BuildSystem/infer_dumps_deps_if_verbose_build.test b/validation-test/BuildSystem/infer_dumps_deps_if_verbose_build.test index 5cfe414ef81b8..b2be33a31349b 100644 --- a/validation-test/BuildSystem/infer_dumps_deps_if_verbose_build.test +++ b/validation-test/BuildSystem/infer_dumps_deps_if_verbose_build.test @@ -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. # diff --git a/validation-test/BuildSystem/infer_implies_install_all.test b/validation-test/BuildSystem/infer_implies_install_all.test index 16fee74e3d318..d4ccde59edbb5 100644 --- a/validation-test/BuildSystem/infer_implies_install_all.test +++ b/validation-test/BuildSystem/infer_implies_install_all.test @@ -7,6 +7,5 @@ # CHECK: --- Installing cmark --- # CHECK: --- Installing llvm --- # CHECK: --- Installing swift --- -# CHECK: --- Installing llbuild --- # CHECK: --- Building swiftpm --- # CHECK: --- Installing swiftpm --- diff --git a/validation-test/BuildSystem/install_all_linux.test b/validation-test/BuildSystem/install_all_linux.test index 1777a9a5091c6..0110468e41a55 100644 --- a/validation-test/BuildSystem/install_all_linux.test +++ b/validation-test/BuildSystem/install_all_linux.test @@ -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 ---