Skip to content

Commit

Permalink
Remove gcc changes for dist build
Browse files Browse the repository at this point in the history
  • Loading branch information
GuillaumeGomez committed Sep 13, 2024
1 parent 6917514 commit e7fa03b
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions src/bootstrap/src/core/build_steps/dist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit e7fa03b

Please sign in to comment.