diff options
| author | bors <bors@rust-lang.org> | 2024-12-06 15:49:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-12-06 15:49:11 +0000 |
| commit | cdeddae4f6f0934d9cc895fe1cacccba78ff1981 (patch) | |
| tree | a280cd6ef6611415bf3812b644692a5e2889d4c5 /compiler/rustc_codegen_cranelift/scripts/test_bootstrap.sh | |
| parent | bc145cec4565a97a1b08df52d26ddf48ce3d7d0a (diff) | |
| parent | 063e21b4c497ee626c1a6770e82fa75070c1e8ab (diff) | |
| download | rust-cdeddae4f6f0934d9cc895fe1cacccba78ff1981.tar.gz rust-cdeddae4f6f0934d9cc895fe1cacccba78ff1981.zip | |
Auto merge of #133956 - bjorn3:sync_cg_clif-2024-12-06, r=bjorn3
Sync cg clif 2024 12 06 The main highlights this time are a Cranelift update disabling the clif ir verifier by default for better performance. r? `@ghost` `@rustbot` label +A-codegen +A-cranelift +T-compiler
Diffstat (limited to 'compiler/rustc_codegen_cranelift/scripts/test_bootstrap.sh')
| -rwxr-xr-x | compiler/rustc_codegen_cranelift/scripts/test_bootstrap.sh | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/compiler/rustc_codegen_cranelift/scripts/test_bootstrap.sh b/compiler/rustc_codegen_cranelift/scripts/test_bootstrap.sh index 770f2b6df6c..791d457993d 100755 --- a/compiler/rustc_codegen_cranelift/scripts/test_bootstrap.sh +++ b/compiler/rustc_codegen_cranelift/scripts/test_bootstrap.sh @@ -11,22 +11,5 @@ 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 |
