diff options
| author | bors <bors@rust-lang.org> | 2025-09-30 15:32:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-09-30 15:32:50 +0000 |
| commit | 42d009c0a9be0f7020a03f85dd47faa00d6d7bdf (patch) | |
| tree | 47e9d9315b63df4801326384e4b2bc9811d0bf29 /src | |
| parent | a2db9280539229a3b8a084a09886670a57bc7e9c (diff) | |
| parent | 22643032d4eea2a7fcb51d7384741fe970c99673 (diff) | |
| download | rust-42d009c0a9be0f7020a03f85dd47faa00d6d7bdf.tar.gz rust-42d009c0a9be0f7020a03f85dd47faa00d6d7bdf.zip | |
Auto merge of #147186 - Zalathar:rollup-sza9wxl, r=Zalathar
Rollup of 5 pull requests Successful merges: - rust-lang/rust#140916 (Fix unuseful span in type error in some format_args!() invocations) - rust-lang/rust#146011 (Point at fn bound that introduced lifetime obligation) - rust-lang/rust#146649 (cmse: fix 'region variables should not be hashed') - rust-lang/rust#147109 (Rename various "concrete opaque type" things to say "hidden type") - rust-lang/rust#147167 (Don't condition RUSTDOC_LIBDIR on `--no-doc`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/src/core/builder/cargo.rs | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/bootstrap/src/core/builder/cargo.rs b/src/bootstrap/src/core/builder/cargo.rs index 9fc4ce669c2..a404aec5120 100644 --- a/src/bootstrap/src/core/builder/cargo.rs +++ b/src/bootstrap/src/core/builder/cargo.rs @@ -10,7 +10,7 @@ use crate::core::config::flags::Color; use crate::utils::build_stamp; use crate::utils::helpers::{self, LldThreads, check_cfg_arg, linker_args, linker_flags}; use crate::{ - BootstrapCommand, CLang, Compiler, Config, DocTests, DryRun, EXTRA_CHECK_CFGS, GitRepo, Mode, + BootstrapCommand, CLang, Compiler, Config, DryRun, EXTRA_CHECK_CFGS, GitRepo, Mode, RemapScheme, TargetSelection, command, prepare_behaviour_dump_dir, t, }; @@ -851,8 +851,6 @@ impl Builder<'_> { rustflags.arg("-Zmacro-backtrace"); - let want_rustdoc = self.doc_tests != DocTests::No; - // Clear the output directory if the real rustc we're using has changed; // Cargo cannot detect this as it thinks rustc is bootstrap/debug/rustc. // @@ -881,7 +879,8 @@ impl Builder<'_> { .env("RUSTC_REAL", self.rustc(compiler)) .env("RUSTC_STAGE", build_compiler_stage.to_string()) .env("RUSTC_SYSROOT", sysroot) - .env("RUSTC_LIBDIR", libdir) + .env("RUSTC_LIBDIR", &libdir) + .env("RUSTDOC_LIBDIR", libdir) .env("RUSTDOC", self.bootstrap_out.join("rustdoc")) .env("RUSTDOC_REAL", rustdoc_path) .env("RUSTC_ERROR_METADATA_DST", self.extended_error_dir()); @@ -919,11 +918,6 @@ impl Builder<'_> { rustflags.arg(&format!("-Zstack-protector={stack_protector}")); } - if !matches!(cmd_kind, Kind::Build | Kind::Check | Kind::Clippy | Kind::Fix) && want_rustdoc - { - cargo.env("RUSTDOC_LIBDIR", self.rustc_libdir(compiler)); - } - let debuginfo_level = match mode { Mode::Rustc | Mode::Codegen => self.config.rust_debuginfo_level_rustc, Mode::Std => self.config.rust_debuginfo_level_std, |