Skip to content

Commit 70e9b5a

Browse files
committed
auto merge of #10260 : alexcrichton/rust/fix-temp-name, r=thestinger
This file did not respect the #[link(name = "...")] attribute when it was clearly intended to do so. The problem is that the crate attributes just weren't passed in. This causes lots of problems in rust today because the object file for all our libraries is inferred to be 'lib.o' because all of the files are called 'lib.rs'. I tried to figure out a good way to test for this, but I wasn't able to come up with a good way that fit into our current testing framework. Nonetheless, I have tested this locally and object files get named as they should. This should fix compiling with `make -jN` again (because the object files are all different again).
2 parents 94677c1 + c3089a1 commit 70e9b5a

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/librustc/driver/driver.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,8 @@ pub fn compile_input(sess: Session, cfg: ast::CrateConfig, input: &input,
441441
};
442442
let analysis = phase_3_run_analysis_passes(sess, &expanded_crate);
443443
if stop_after_phase_3(sess) { return; }
444-
let outputs = build_output_filenames(input, outdir, output, [], sess);
444+
let outputs = build_output_filenames(input, outdir, output,
445+
expanded_crate.attrs, sess);
445446
let trans = phase_4_translate_to_llvm(sess, expanded_crate,
446447
&analysis, outputs);
447448
(outputs, trans)

0 commit comments

Comments
 (0)