user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove gcc changes for dist build

Browse source
This commit is contained in:
Guillaume Gomez 2024-09-13 17:14:40 +02:00
parent 691751416e
commit e7fa03ba5e
1 changed files with 0 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/bootstrap/src/core/build_steps/dist.rs
View file

@ -2273,9 +2273,6 @@ impl Step for RustDev {
tarball.permit_symlinks(true);
builder.ensure(crate::core::build_steps::llvm::Llvm { target });
if target.contains("linux") && target.contains("x86_64") {
builder.ensure(crate::core::build_steps::gcc::Gcc { target });
}
let src_bindir = builder.llvm_out(target).join("bin");
// If updating this, you likely want to change
@ -2311,15 +2308,6 @@ impl Step for RustDev {
// just broadly useful to be able to link against the bundled LLVM.
tarball.add_dir(builder.llvm_out(target).join("include"), "include");
let libgccjit_path = builder.gcc_out(target).join("install/lib/libgccjit.so");
if libgccjit_path.exists() {
tarball.add_dir(libgccjit_path, "libgccjit.so");
tarball.add_dir(
builder.gcc_out(target).join("install/lib/libgccjit.so.0"),
"libgccjit.so.0",
);
}
// Copy libLLVM.so to the target lib dir as well, so the RPATH like
// `$ORIGIN/../lib` can find it. It may also be used as a dependency
// of `rustc-dev` to support the inherited `-lLLVM` when using the