rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rollup merge of #52439 - o01eg:fix-52317, r=alexcrichton

Browse Source 
Revert some changes from #51917 to fix custom libdir

Should fix #52317 also adds `libdir` value to output.
This commit is contained in:
kennytm
2018-07-18 22:34:57 +08:00
committed by GitHub
parent 21f7d2b674 10b65fa603
commit 47a1d6b183
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/bootstrap/bin/rustdoc.rs
View File

@@ -35,7 +35,7 @@ fn main() {
}; };
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.clone()));
let mut cmd = Command::new(rustdoc); let mut cmd = Command::new(rustdoc);
cmd.args(&args) cmd.args(&args)
@@ -69,6 +69,7 @@ fn main() {
if verbose > 1 { if verbose > 1 {
eprintln!("rustdoc command: {:?}", cmd); eprintln!("rustdoc command: {:?}", cmd);
eprintln!("libdir: {:?}", libdir);
} }
std::process::exit(match cmd.status() { std::process::exit(match cmd.status() {

2
src/bootstrap/builder.rs
View File

@@ -825,7 +825,7 @@ impl<'a> Builder<'a> {
cargo.env("RUSTC_ERROR_FORMAT", error_format); cargo.env("RUSTC_ERROR_FORMAT", error_format);
} }
if cmd != "build" && cmd != "check" && want_rustdoc { if cmd != "build" && cmd != "check" && want_rustdoc {
cargo.env("RUSTDOC_LIBDIR", &libdir); cargo.env("RUSTDOC_LIBDIR", self.sysroot_libdir(compiler, self.config.build));
} }
if mode.is_tool() { if mode.is_tool() {