Skip to content

Commit b5966e4

Browse files
committed
Fix bootstrap test
1 parent b71483b commit b5966e4

File tree

1 file changed

+17
-0
lines changed

1 file changed

+17
-0
lines changed

scripts/test_bootstrap.sh

+17
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,22 @@ rm -r compiler/rustc_codegen_cranelift/{Cargo.*,src}
1111
cp ../Cargo.* compiler/rustc_codegen_cranelift/
1212
cp -r ../src compiler/rustc_codegen_cranelift/src
1313

14+
# FIXME(rust-lang/rust#132719) remove once it doesn't break without this patch
15+
cat <<EOF | git apply -
16+
diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
17+
index 3394f2a84a0..cb980dd4d7c 100644
18+
--- a/src/bootstrap/src/core/build_steps/compile.rs
19+
+++ b/src/bootstrap/src/core/build_steps/compile.rs
20+
@@ -1976,7 +1976,7 @@ fn run(self, builder: &Builder<'_>) -> Compiler {
21+
}
22+
}
23+
24+
- {
25+
+ if builder.config.llvm_enabled(target_compiler.host) && builder.config.llvm_tools_enabled {
26+
// \`llvm-strip\` is used by rustc, which is actually just a symlink to \`llvm-objcopy\`,
27+
// so copy and rename \`llvm-objcopy\`.
28+
let src_exe = exe("llvm-objcopy", target_compiler.host);
29+
EOF
30+
1431
./x.py build --stage 1 library/std
1532
popd

0 commit comments

Comments
 (0)