diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2022-07-31 17:45:15 -0400 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2022-08-20 09:47:59 -0400 |
| commit | 6c7f30114515111c53224e2de1434a324f73c0e8 (patch) | |
| tree | 08f19bc37043beac017217fde70a2bf7cfa20d30 /src/ci/scripts | |
| parent | 8ca14aa7ff9d0c4adde9c9058acbb2edf59bb05f (diff) | |
| download | rust-6c7f30114515111c53224e2de1434a324f73c0e8.tar.gz rust-6c7f30114515111c53224e2de1434a324f73c0e8.zip | |
Enable downloading prebuilt LLVM in test builders
See comment added for details on the test builder restriction. This is primarily intended for macOS CI, but is likely to be a slight win on other builders too.
Diffstat (limited to 'src/ci/scripts')
| -rwxr-xr-x | src/ci/scripts/install-clang.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ci/scripts/install-clang.sh b/src/ci/scripts/install-clang.sh index 0bc8a0389a8..02b72625d6e 100755 --- a/src/ci/scripts/install-clang.sh +++ b/src/ci/scripts/install-clang.sh @@ -61,6 +61,10 @@ elif isWindows && [[ ${CUSTOM_MINGW-0} -ne 1 ]]; then 7z x -oclang-rust/ "LLVM-${LLVM_VERSION}-win64.exe" ciCommandSetEnv RUST_CONFIGURE_ARGS \ "${RUST_CONFIGURE_ARGS} --set llvm.clang-cl=$(pwd)/clang-rust/bin/clang-cl.exe" + + # Disable downloading CI LLVM on this builder; + # setting up clang-cl just above conflicts with the default if-available option. + ciCommandSetEnv NO_DOWNLOAD_CI_LLVM 1 fi if isWindows; then |