Skip to content

Commit ef5ef53

Browse files
authored
Rollup merge of #109562 - bjorn3:update_ar_archive_writer, r=Mark-Simulacrum
Update ar_archive_writer to 0.1.3 This updates object to 0.30 and fixes a bug where the symbol table would be omitted for archives where there are object files yet none that export any symbol. This bug could lead to linker errors for crates like rustc_std_workspace_core which don't contain any code of their own but exist solely for their dependencies. This is likely the cause of the linker issues I was experiencing on Webassembly. It has been shown to cause issues on other platforms too. cc rust-lang/ar_archive_writer#5
2 parents 7e90732 + 8b1be44 commit ef5ef53

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Diff for: Cargo.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,11 @@ checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602"
106106

107107
[[package]]
108108
name = "ar_archive_writer"
109-
version = "0.1.1"
109+
version = "0.1.3"
110110
source = "registry+https://github.com/rust-lang/crates.io-index"
111-
checksum = "276881980556fdadeb88aa1ffc667e4d2e8fe72531dfabcb7a82bb3c9ea9ba31"
111+
checksum = "b0639441fd17a3197d1cbca8dc8768cc172a63b64b4bb6c372e8f41ed0acc9bb"
112112
dependencies = [
113-
"object 0.29.0",
113+
"object 0.30.1",
114114
]
115115

116116
[[package]]

Diff for: compiler/rustc_codegen_llvm/src/back/archive.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ impl ArchiveBuilderBuilder for LlvmArchiveBuilderBuilder {
110110
fn new_archive_builder<'a>(&self, sess: &'a Session) -> Box<dyn ArchiveBuilder<'a> + 'a> {
111111
// FIXME use ArArchiveBuilder on most targets again once reading thin archives is
112112
// implemented
113-
if true || sess.target.arch == "wasm32" || sess.target.arch == "wasm64" {
113+
if true {
114114
Box::new(LlvmArchiveBuilder { sess, additions: Vec::new() })
115115
} else {
116116
Box::new(ArArchiveBuilder::new(sess, get_llvm_object_symbols))

0 commit comments

Comments
 (0)