Skip to content

Commit 54db8a5

Browse files
committed
Revert "Remove unnecessary download-ci-llvm from setup_rust_fork.sh"
It caused LLVM to be cloned on CI. This reverts commit 812388a.
1 parent 91afcca commit 54db8a5

File tree

1 file changed

+25
-0
lines changed

1 file changed

+25
-0
lines changed

scripts/setup_rust_fork.sh

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ git -c user.name=Dummy -c [email protected] -c commit.gpgSign=false \
2525
cat > config.toml <<EOF
2626
change-id = 999999
2727
28+
[llvm]
29+
download-ci-llvm = true
30+
2831
[build]
2932
rustc = "$(pwd)/../dist/bin/rustc-clif"
3033
cargo = "$(rustup which cargo)"
@@ -41,6 +44,28 @@ verbose-tests = false
4144
# compiler.
4245
llvm-tools = false
4346
std-features = ["panic-unwind"]
47+
48+
EOF
49+
50+
cat <<EOF | git apply -
51+
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
52+
index cf4ef4ee310..fe78560fcaf 100644
53+
--- a/src/bootstrap/src/core/config/config.rs
54+
+++ b/src/bootstrap/src/core/config/config.rs
55+
@@ -3138,13 +3138,6 @@ fn parse_download_ci_llvm(
56+
);
57+
}
58+
59+
- if b && self.is_running_on_ci {
60+
- // On CI, we must always rebuild LLVM if there were any modifications to it
61+
- panic!(
62+
- "\`llvm.download-ci-llvm\` cannot be set to \`true\` on CI. Use \`if-unchanged\` instead."
63+
- );
64+
- }
65+
-
66+
// If download-ci-llvm=true we also want to check that CI llvm is available
67+
b && llvm::is_ci_llvm_available_for_target(self, asserts)
68+
}
4469
EOF
4570

4671
popd

0 commit comments

Comments
 (0)