X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fci%2Frun.sh;h=091ccf58e2b81cdebd075dac134fda52357e88c7;hb=6c7f30114515111c53224e2de1434a324f73c0e8;hp=6545475d996419ef4d607aa44e7453546cdada85;hpb=1dc485891479f5cbe07b6b87ae227fd54e5d3805;p=rust.git

diff --git a/src/ci/run.sh b/src/ci/run.sh
index 6545475d996..091ccf58e2b 100755
--- a/src/ci/run.sh
+++ b/src/ci/run.sh
@@ -102,6 +102,18 @@ else
   fi
 
   RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.verify-llvm-ir"
+
+  # We enable this for non-dist builders, since those aren't trying to produce
+  # fresh binaries. We currently don't entirely support distributing a fresh
+  # copy of the compiler (including llvm tools, etc.) if we haven't actually
+  # built LLVM, since not everything necessary is copied into the
+  # local-usage-only LLVM artifacts. If that changes, this could maybe be made
+  # true for all builds. In practice it's probably a good idea to keep building
+  # LLVM continuously on at least some builders to ensure it works, though.
+  # (And PGO is its own can of worms).
+  if [ "$NO_DOWNLOAD_CI_LLVM" = "" ]; then
+    RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set llvm.download-ci-llvm=if-available"
+  fi
 fi
 
 if [ "$RUST_RELEASE_CHANNEL" = "nightly" ] || [ "$DIST_REQUIRE_ALL_TOOLS" = "" ]; then