bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Print out the sysroot and libdir on verbose builds.

Browse source
This commit is contained in:
Mark Simulacrum 2018-02-14 18:50:11 -07:00
parent 1c8f3b011c
commit c8edb36520
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/bootstrap/bin/rustc.rs
View file

@ -95,7 +95,7 @@ fn main() {
let rustc = env::var_os(rustc).unwrap_or_else(|| panic!("{:?} was not set", rustc)); let rustc = env::var_os(rustc).unwrap_or_else(|| panic!("{:?} was not set", rustc));
let libdir = env::var_os(libdir).unwrap_or_else(|| panic!("{:?} was not set", libdir)); let libdir = env::var_os(libdir).unwrap_or_else(|| panic!("{:?} was not set", libdir));
let mut dylib_path = bootstrap::util::dylib_path(); let mut dylib_path = bootstrap::util::dylib_path();
dylib_path.insert(0, PathBuf::from(libdir)); dylib_path.insert(0, PathBuf::from(&libdir));
let mut cmd = Command::new(rustc); let mut cmd = Command::new(rustc);
cmd.args(&args) cmd.args(&args)
@ -107,7 +107,7 @@ fn main() {
if let Some(target) = target { if let Some(target) = target {
// The stage0 compiler has a special sysroot distinct from what we // The stage0 compiler has a special sysroot distinct from what we
// actually downloaded, so we just always pass the `--sysroot` option. // actually downloaded, so we just always pass the `--sysroot` option.
cmd.arg("--sysroot").arg(sysroot); cmd.arg("--sysroot").arg(&sysroot);
// When we build Rust dylibs they're all intended for intermediate // When we build Rust dylibs they're all intended for intermediate
// usage, so make sure we pass the -Cprefer-dynamic flag instead of // usage, so make sure we pass the -Cprefer-dynamic flag instead of
@ -280,6 +280,8 @@ fn main() {
if verbose > 1 { if verbose > 1 {
eprintln!("rustc command: {:?}", cmd); eprintln!("rustc command: {:?}", cmd);
eprintln!("sysroot: {:?}", sysroot);
eprintln!("libdir: {:?}", libdir);
} }
// Actually run the compiler! // Actually run the compiler!