diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2024-11-07 11:33:34 +0000 |
|---|---|---|
| committer | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2024-11-07 11:34:46 +0000 |
| commit | b5966e4e88b649997bce5948ced6730a4913e692 (patch) | |
| tree | b9981fcec910f39fc17839235635e8c10f7974e9 | |
| parent | b71483b2a14a404932e1167d567468fefa43d27c (diff) | |
| download | rust-b5966e4e88b649997bce5948ced6730a4913e692.tar.gz rust-b5966e4e88b649997bce5948ced6730a4913e692.zip | |
Fix bootstrap test
| -rwxr-xr-x | scripts/test_bootstrap.sh | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/scripts/test_bootstrap.sh b/scripts/test_bootstrap.sh index 791d457993d..770f2b6df6c 100755 --- a/scripts/test_bootstrap.sh +++ b/scripts/test_bootstrap.sh @@ -11,5 +11,22 @@ rm -r compiler/rustc_codegen_cranelift/{Cargo.*,src} cp ../Cargo.* compiler/rustc_codegen_cranelift/ cp -r ../src compiler/rustc_codegen_cranelift/src +# FIXME(rust-lang/rust#132719) remove once it doesn't break without this patch +cat <<EOF | git apply - +diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs +index 3394f2a84a0..cb980dd4d7c 100644 +--- a/src/bootstrap/src/core/build_steps/compile.rs ++++ b/src/bootstrap/src/core/build_steps/compile.rs +@@ -1976,7 +1976,7 @@ fn run(self, builder: &Builder<'_>) -> Compiler { + } + } + +- { ++ if builder.config.llvm_enabled(target_compiler.host) && builder.config.llvm_tools_enabled { + // \`llvm-strip\` is used by rustc, which is actually just a symlink to \`llvm-objcopy\`, + // so copy and rename \`llvm-objcopy\`. + let src_exe = exe("llvm-objcopy", target_compiler.host); +EOF + ./x.py build --stage 1 library/std popd |