Skip to content

Commit 812388a

Browse files
committed
Remove unnecessary download-ci-llvm from setup_rust_fork.sh
1 parent d47ae4a commit 812388a

File tree

1 file changed

+0
-25
lines changed

1 file changed

+0
-25
lines changed

scripts/setup_rust_fork.sh

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ 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-
3128
[build]
3229
rustc = "$(pwd)/../dist/bin/rustc-clif"
3330
cargo = "$(rustup which cargo)"
@@ -44,28 +41,6 @@ verbose-tests = false
4441
# compiler.
4542
llvm-tools = false
4643
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-
}
6944
EOF
7045

7146
popd

0 commit comments

Comments
 (0)