Skip to content

Commit d962e00

Browse files
committed
Fix rustc test suite
1 parent 20cc800 commit d962e00

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

scripts/setup_rust_fork.sh

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -50,23 +50,23 @@ EOF
5050

5151
cat <<EOF | git apply -
5252
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
53-
index cf4ef4ee310..fe78560fcaf 100644
53+
index a656927b1f6..44fc5546fac 100644
5454
--- a/src/bootstrap/src/core/config/config.rs
5555
+++ b/src/bootstrap/src/core/config/config.rs
56-
@@ -3138,13 +3138,6 @@ fn parse_download_ci_llvm(
57-
);
58-
}
56+
@@ -2249,13 +2249,6 @@ pub fn parse_download_ci_llvm<'a>(
57+
);
58+
}
5959
60-
- if b && self.is_running_on_ci {
61-
- // On CI, we must always rebuild LLVM if there were any modifications to it
62-
- panic!(
63-
- "\`llvm.download-ci-llvm\` cannot be set to \`true\` on CI. Use \`if-unchanged\` instead."
64-
- );
65-
- }
60+
- if b && dwn_ctx.is_running_on_ci {
61+
- // On CI, we must always rebuild LLVM if there were any modifications to it
62+
- panic!(
63+
- "\`llvm.download-ci-llvm\` cannot be set to \`true\` on CI. Use \`if-unchanged\` instead."
64+
- );
65+
- }
6666
-
67-
// If download-ci-llvm=true we also want to check that CI llvm is available
68-
b && llvm::is_ci_llvm_available_for_target(self, asserts)
69-
}
67+
// If download-ci-llvm=true we also want to check that CI llvm is available
68+
b && llvm::is_ci_llvm_available_for_target(&dwn_ctx.host_target, asserts)
69+
}
7070
EOF
7171

7272
popd

0 commit comments

Comments
 (0)