about summary refs log tree commit diff
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2019-03-16 14:57:02 +0800
committerkennytm <kennytm@gmail.com>2019-03-16 22:40:54 +0800
commit2e1104fd9305dd7427da6978b02fdb4428543d60 (patch)
tree06d538f82e95aac4fb0fc8621fec74e6952f99f1
parent524a7afcf25fc0098faf63aeb79beedb6022775b (diff)
parentbcf1a179aed651fe27fef7578bfc25b063a33a8e (diff)
downloadrust-2e1104fd9305dd7427da6978b02fdb4428543d60.tar.gz
rust-2e1104fd9305dd7427da6978b02fdb4428543d60.zip
Rollup merge of #59204 - o01eg:diag-rustdoc, r=alexcrichton
Output diagnostic information for rustdoc

Use the information same as rustc.
-rw-r--r--src/bootstrap/bin/rustdoc.rs10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/bootstrap/bin/rustdoc.rs b/src/bootstrap/bin/rustdoc.rs
index 36beec3a944..085f243785c 100644
--- a/src/bootstrap/bin/rustdoc.rs
+++ b/src/bootstrap/bin/rustdoc.rs
@@ -35,7 +35,7 @@ fn main() {
         .arg("--cfg")
         .arg("dox")
         .arg("--sysroot")
-        .arg(sysroot)
+        .arg(&sysroot)
         .env(bootstrap::util::dylib_path_var(),
              env::join_paths(&dylib_path).unwrap());
 
@@ -72,7 +72,13 @@ fn main() {
     }
 
     if verbose > 1 {
-        eprintln!("rustdoc command: {:?}", cmd);
+        eprintln!(
+            "rustdoc command: {:?}={:?} {:?}",
+            bootstrap::util::dylib_path_var(),
+            env::join_paths(&dylib_path).unwrap(),
+            cmd,
+        );
+        eprintln!("sysroot: {:?}", sysroot);
         eprintln!("libdir: {:?}", libdir);
     }