Skip to content

Commit

Permalink
Workaround for rust-lang#46995.
Browse files Browse the repository at this point in the history
  • Loading branch information
whitequark committed Dec 26, 2017
1 parent 3581518 commit b45a81a
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions src/bootstrap/tool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,10 @@ impl Step for Rustdoc {
cargo.env("RUSTC_DEBUGINFO", builder.config.rust_debuginfo.to_string())
.env("RUSTC_DEBUGINFO_LINES", builder.config.rust_debuginfo_lines.to_string());

if build.config.llvm_link_shared {
cargo.env("LLVM_LINK_SHARED", "1");
}

build.run(&mut cargo);
// Cargo adds a number of paths to the dylib search path on windows, which results in
// the wrong rustdoc being executed. To avoid the conflicting rustdocs, we name the "tool"
Expand Down
1 change: 1 addition & 0 deletions src/tools/rustdoc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ path = "main.rs"

[dependencies]
rustdoc = { path = "../../librustdoc" }
rustc_llvm = { path = "../../librustc_llvm" }
1 change: 1 addition & 0 deletions src/tools/rustdoc/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@
// except according to those terms.

extern crate rustdoc;
extern crate rustc_llvm;

fn main() { rustdoc::main() }

0 comments on commit b45a81a

Please sign in to comment.