nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-13 07:24:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make use of sysroot in librustdoc/config.rs for builtin:$path

Browse Source
This commit is contained in:
Lukas Wirth 2024-03-04 09:07:02 +01:00
parent 91547573af
commit 9ae4e3eb7c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/librustdoc/config.rs
View File

@ -623,11 +623,12 @@ impl Options {
} }
let target = parse_target_triple(early_dcx, matches); let target = parse_target_triple(early_dcx, matches);
let maybe_sysroot = matches.opt_str("sysroot").map(PathBuf::from);
let libs = matches let libs = matches
.opt_strs("L") .opt_strs("L")
.iter() .iter()
.map(|s| SearchPath::from_cli_opt(None, &target, early_dcx, s)) .map(|s| SearchPath::from_cli_opt(maybe_sysroot.as_deref(), &target, early_dcx, s))
.collect(); .collect();
let show_coverage = matches.opt_present("show-coverage"); let show_coverage = matches.opt_present("show-coverage");
@ -657,7 +658,6 @@ impl Options {
let bin_crate = crate_types.contains(&CrateType::Executable); let bin_crate = crate_types.contains(&CrateType::Executable);
let proc_macro_crate = crate_types.contains(&CrateType::ProcMacro); let proc_macro_crate = crate_types.contains(&CrateType::ProcMacro);
let playground_url = matches.opt_str("playground-url"); let playground_url = matches.opt_str("playground-url");
let maybe_sysroot = matches.opt_str("sysroot").map(PathBuf::from);
let module_sorting = if matches.opt_present("sort-modules-by-appearance") { let module_sorting = if matches.opt_present("sort-modules-by-appearance") {
ModuleSorting::DeclarationOrder ModuleSorting::DeclarationOrder
} else { } else {