about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume.gomez@huawei.com>2024-09-13 17:14:40 +0200
committerGuillaume Gomez <guillaume.gomez@huawei.com>2024-09-13 17:14:40 +0200
commite7fa03ba5e6c2386afa0ab8e96ddcff3083d909f (patch)
treeb34a78d306411c97ede50e00725afd7e39a6c003
parent691751416e9ded004fe6aa4ede0c4ba5741a08e9 (diff)
downloadrust-e7fa03ba5e6c2386afa0ab8e96ddcff3083d909f.tar.gz
rust-e7fa03ba5e6c2386afa0ab8e96ddcff3083d909f.zip
Remove gcc changes for dist build
-rw-r--r--src/bootstrap/src/core/build_steps/dist.rs12
1 files changed, 0 insertions, 12 deletions
diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs
index 630beb7a609..4957de2e1b7 100644
--- a/src/bootstrap/src/core/build_steps/dist.rs
+++ b/src/bootstrap/src/core/build_steps/dist.rs
@@ -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