bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Merge commit '09fae60a86' into sync_cg_clif-2024-03-28

Browse source
This commit is contained in:
bjorn3 2024-03-28 11:43:35 +00:00
commit 987ed345af
24 changed files with 840 additions and 291 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/rustc_codegen_cranelift/scripts/rustdoc-clif.rs
View file

@ -26,12 +26,18 @@ fn main() {
codegen_backend_arg.push(cg_clif_dylib_path);
args.push(codegen_backend_arg);
}
if !passed_args.iter().any(|arg| {
arg == "--sysroot" || arg.to_str().is_some_and(|s| s.starts_with("--sysroot="))
}) {
if !passed_args
.iter()
.any(|arg| arg == "--sysroot" || arg.to_str().is_some_and(|s| s.starts_with("--sysroot=")))
{
args.push(OsString::from("--sysroot"));
args.push(OsString::from(sysroot.to_str().unwrap()));
}
if passed_args.is_empty() {
// Don't pass any arguments when the user didn't pass any arguments
// either to ensure the help message is shown.
args.clear();
}
args.extend(passed_args);
let rustdoc = if let Some(rustdoc) = option_env!("RUSTDOC") {