diff options
| author | Mark Simulacrum <mark.simulacrum@gmail.com> | 2017-06-22 06:30:12 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-22 06:30:12 -0600 |
| commit | 7f693e2cb9455fcfbe4de69236abc6a0ef98624b (patch) | |
| tree | 499dd45c3dff5ed1a0dd5f22bc318d6b523eafdc /src/bootstrap/bin | |
| parent | ea7db0787d9e03ffbe7e3f9aea2875ea077fc1e8 (diff) | |
| parent | ae1dc2a6f902cea5b6e833497b11d8860acabfd9 (diff) | |
| download | rust-7f693e2cb9455fcfbe4de69236abc6a0ef98624b.tar.gz rust-7f693e2cb9455fcfbe4de69236abc6a0ef98624b.zip | |
Rollup merge of #42806 - ollie27:rustbuild_compiler_docs, r=alexcrichton
rustbuild: Fix compiler docs yet again Add support for `-Z force-unstable-if-unmarked` to rustdoc. r? @alexcrichton
Diffstat (limited to 'src/bootstrap/bin')
| -rw-r--r-- | src/bootstrap/bin/rustdoc.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/bootstrap/bin/rustdoc.rs b/src/bootstrap/bin/rustdoc.rs index 3a1a9c3e40d..d7d72d5dd56 100644 --- a/src/bootstrap/bin/rustdoc.rs +++ b/src/bootstrap/bin/rustdoc.rs @@ -41,11 +41,11 @@ fn main() { .env(bootstrap::util::dylib_path_var(), env::join_paths(&dylib_path).unwrap()); - // Pass the `rustbuild` feature flag to crates which rustbuild is - // building. See the comment in bootstrap/lib.rs where this env var is - // set for more details. - if env::var_os("RUSTBUILD_UNSTABLE").is_some() { - cmd.arg("--cfg").arg("rustbuild"); + // Force all crates compiled by this compiler to (a) be unstable and (b) + // allow the `rustc_private` feature to link to other unstable crates + // also in the sysroot. + if env::var_os("RUSTC_FORCE_UNSTABLE").is_some() { + cmd.arg("-Z").arg("force-unstable-if-unmarked"); } std::process::exit(match cmd.status() { |