Commit e1afff0

committed

Use a fixed rust-ar

1 parent 49b6395 commit e1afff0Copy full SHA for e1afff0

File tree

-14

lines changed

-14

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ core = { version = "1.0.0", optional = true, package = 'rustc-std-workspace-core`
`33`	`33`
`34`	`34`	`[build-dependencies]`
`35`	`35`	`cc = { optional = true, version = "1.0" }`
`36`		`-ar = { optional = true }`
	`36`	`+ar = { optional = true, path = "../rust-ar" }`
`37`	`37`
`38`	`38`	`[dev-dependencies]`
`39`	`39`	`panic-handler = { path = 'crates/panic-handler' }`

Lines changed: 1 addition & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -504,16 +504,6 @@ mod c_system {`
`504`	`504`	`r.to_string()`
`505`	`505`	`}`
`506`	`506`
`507`		`- // TODO: this really should be part of ar`
`508`		`- fn clone_header(h0: &ar::Header) -> ar::Header {`
`509`		`- let mut h = ar::Header::new(h0.identifier().to_vec(), h0.size());`
`510`		`- h.set_mtime(h0.mtime());`
`511`		`- h.set_uid(h0.uid());`
`512`		`- h.set_gid(h0.gid());`
`513`		`- h.set_mode(h0.mode());`
`514`		`- h`
`515`		`- }`
`516`		`-`
`517`	`507`	`fn find_library<I>(dirs: I, libname: &str) -> Result<PathBuf, Vec<String>>`
`518`	`508`	`where`
`519`	`509`	`I: Iterator<Item = PathBuf>`
`@@ -600,11 +590,9 @@ mod c_system {`
`600`	`590`	`},`
`601`	`591`	`}`
`602`	`592`	`};`
`603`		`- orig.jump_to_entry(i).unwrap(); // Work around a stupid rust-ar bug`
`604`	`593`	`let mut entry = orig.jump_to_entry(i).unwrap();`
`605`		`- let header = clone_header(entry.header());`
`606`	`594`	`// TODO: ar really should have an append_entry to avoid the clone`
`607`		`- new.append(&header, &mut entry).unwrap();`
	`595`	`+ new.append(&entry.header().clone(), &mut entry).unwrap();`
`608`	`596`	`println!("cargo:rustc-cfg={}=\"optimized-c\"", sym);`
`609`	`597`	`}`
`610`	`598`

Comments

(0)