about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2017-12-15 09:26:59 -0500
committerGitHub <noreply@github.com>2017-12-15 09:26:59 -0500
commit180a6b25df7c2c570f1160ed11381bec0a4d7d7e (patch)
tree7bc7d56a45a20995ba5d3eeb6091c52ae5f69518
parent1375be833af1ee94edac08cad87e1f64c9ab827f (diff)
parent2f33093ed6377dbd3ffb94d41333d3e06b6efa3d (diff)
downloadrust-180a6b25df7c2c570f1160ed11381bec0a4d7d7e.tar.gz
rust-180a6b25df7c2c570f1160ed11381bec0a4d7d7e.zip
Rollup merge of #46705 - pornel:cargo-output, r=alexcrichton
Help Cargo tolerate RUSTFLAGS="--print=native-static-libs"

Alternative to https://github.com/rust-lang/cargo/pull/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.
-rw-r--r--src/librustc_driver/lib.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/librustc_driver/lib.rs b/src/librustc_driver/lib.rs
index 8bfcb0cca05..29d3d31e451 100644
--- a/src/librustc_driver/lib.rs
+++ b/src/librustc_driver/lib.rs
@@ -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;