File tree Expand file tree Collapse file tree 1 file changed +25
-0
lines changed Expand file tree Collapse file tree 1 file changed +25
-0
lines changed Original file line number Diff line number Diff line change @@ -25,6 +25,9 @@ git -c user.name=Dummy -c
[email protected] -c commit.gpgSign=false \
25
25
cat > config.toml << EOF
26
26
change-id = 999999
27
27
28
+ [llvm]
29
+ download-ci-llvm = true
30
+
28
31
[build]
29
32
rustc = "$( pwd) /../dist/bin/rustc-clif"
30
33
cargo = "$( rustup which cargo) "
@@ -41,6 +44,28 @@ verbose-tests = false
41
44
# compiler.
42
45
llvm-tools = false
43
46
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
+ }
44
69
EOF
45
70
46
71
popd
You can’t perform that action at this time.
0 commit comments