Skip to content

Commit 6acf50f

Browse files
authored
Auto merge of #3205 - matklad:fix-rustdoc-ld-path, r=alexcrichton
Pass target environment for rustdoc This should fix #3200, but I am not sure that this is a correct fix, and I need some input to figure this out. `rustdoc` is invoked in two places, in `cargo_test.rs` and in `cargo_rustc/mod.rs`. Before the refactoring PR, these invocations used different LD_LIBRARY paths. [The one in cargo_rustc](https://github.com/rust-lang/cargo/pull/3198/files#diff-59acd1a3101aebbb591ac7ab51c19d9eR427) used "host" version, while [the one in cargo_test](https://github.com/rust-lang/cargo/blob/a8baa5b8f36e88170c8c56523b6eb72efc2cc55e/src/cargo/ops/cargo_test.rs#L131) used "target" version. The original PR changed both to "host", this PR switches both to "target". Is this correct, or should we stick with different environments for building documentation and doctests?
2 parents a8baa5b + 21cdb63 commit 6acf50f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/cargo/ops/cargo_rustc/compilation.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ impl<'cfg> Compilation<'cfg> {
7676

7777
/// See `process`.
7878
pub fn rustdoc_process(&self, pkg: &Package) -> CargoResult<ProcessBuilder> {
79-
self.fill_env(process(&*try!(self.config.rustdoc())), pkg, true)
79+
self.fill_env(process(&*try!(self.config.rustdoc())), pkg, false)
8080
}
8181

8282
/// See `process`.

0 commit comments

Comments
 (0)