Skip to content

Commit

Permalink
Rollup merge of rust-lang#46705 - pornel:cargo-output, r=alexcrichton
Browse files Browse the repository at this point in the history
Help Cargo tolerate RUSTFLAGS="--print=native-static-libs"

Alternative to rust-lang/cargo#4807

Having this "error" message was a mistake, as it's firing at exactly wrong time when Cargo is trying to read the output of other print commands.
  • Loading branch information
steveklabnik authored Dec 15, 2017
2 parents 1375be8 + 2f33093 commit 180a6b2
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions src/librustc_driver/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -810,9 +810,8 @@ impl RustcDefaultCalls {
PrintRequest::TargetCPUs | PrintRequest::TargetFeatures => {
rustc_trans::print(*req, sess);
}
PrintRequest::NativeStaticLibs => {
println!("Native static libs can be printed only during linking");
}
// Any output here interferes with Cargo's parsing of other printed output
PrintRequest::NativeStaticLibs => {}
}
}
return Compilation::Stop;
Expand Down

0 comments on commit 180a6b2

Please sign in to comment.