Address review

rust-lang · Aug 16, 2024 · 9ad3bb1 · 9ad3bb1
1 parent 086c26d
commit 9ad3bb1
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -3427,7 +3427,6 @@ dependencies = [
 name = "rustc_codegen_llvm"
 version = "0.0.0"
 dependencies = [
- "ar_archive_writer",
  "bitflags 2.5.0",
  "itertools",
  "libc",

diff --git a/compiler/rustc_codegen_cranelift/src/lib.rs b/compiler/rustc_codegen_cranelift/src/lib.rs
@@ -12,7 +12,6 @@
 #![warn(unused_lifetimes)]
 // tidy-alphabetical-end
 
-extern crate ar_archive_writer;
 extern crate jobserver;
 #[macro_use]
 extern crate rustc_middle;

diff --git a/compiler/rustc_codegen_llvm/Cargo.toml b/compiler/rustc_codegen_llvm/Cargo.toml
@@ -8,7 +8,6 @@ test = false
 
 [dependencies]
 # tidy-alphabetical-start
-ar_archive_writer = "0.4.0"
 bitflags = "2.4.1"
 itertools = "0.12"
 libc = "0.2"

diff --git a/compiler/rustc_codegen_ssa/src/back/archive.rs b/compiler/rustc_codegen_ssa/src/back/archive.rs
@@ -108,7 +108,7 @@ pub trait ArchiveBuilderBuilder {
                 &exports,
                 machine,
                 !sess.target.is_like_msvc,
-                true,
+                /*comdat=*/ true,
             ) {
                 sess.dcx()
                     .emit_fatal(ErrorCreatingImportLibrary { lib_name, error: error.to_string() });