Revert "Remove unnecessary download-ci-llvm from setup_rust_fork.sh"
It caused LLVM to be cloned on CI.
This reverts commit 812388a717.
This commit is contained in:
parent
91afcca7c5
commit
54db8a58d3
1 changed files with 25 additions and 0 deletions
|
|
@ -25,6 +25,9 @@ git -c user.name=Dummy -c user.email=dummy@example.com -c commit.gpgSign=false \
|
|||
cat > config.toml <<EOF
|
||||
change-id = 999999
|
||||
|
||||
[llvm]
|
||||
download-ci-llvm = true
|
||||
|
||||
[build]
|
||||
rustc = "$(pwd)/../dist/bin/rustc-clif"
|
||||
cargo = "$(rustup which cargo)"
|
||||
|
|
@ -41,6 +44,28 @@ verbose-tests = false
|
|||
# compiler.
|
||||
llvm-tools = false
|
||||
std-features = ["panic-unwind"]
|
||||
|
||||
EOF
|
||||
|
||||
cat <<EOF | git apply -
|
||||
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
|
||||
index cf4ef4ee310..fe78560fcaf 100644
|
||||
--- a/src/bootstrap/src/core/config/config.rs
|
||||
+++ b/src/bootstrap/src/core/config/config.rs
|
||||
@@ -3138,13 +3138,6 @@ fn parse_download_ci_llvm(
|
||||
);
|
||||
}
|
||||
|
||||
- if b && self.is_running_on_ci {
|
||||
- // On CI, we must always rebuild LLVM if there were any modifications to it
|
||||
- panic!(
|
||||
- "\`llvm.download-ci-llvm\` cannot be set to \`true\` on CI. Use \`if-unchanged\` instead."
|
||||
- );
|
||||
- }
|
||||
-
|
||||
// If download-ci-llvm=true we also want to check that CI llvm is available
|
||||
b && llvm::is_ci_llvm_available_for_target(self, asserts)
|
||||
}
|
||||
EOF
|
||||
|
||||
popd
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue