Skip to content

Commit 542dbbd

Browse files
committed
Fix rustc testsuite
1 parent 264e1ad commit 542dbbd

File tree

1 file changed

+22
-0
lines changed

1 file changed

+22
-0
lines changed

scripts/setup_rust_fork.sh

+22
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,28 @@ llvm-tools = false
4646
std-features = ["panic-unwind", "compiler-builtins-no-f16-f128"]
4747
4848
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+
}
69+
EOF
70+
4971
popd
5072

5173
# Allow the testsuite to use llvm tools

0 commit comments

Comments
 (0)