mirror of
https://github.com/dslm4515/BMLFS.git
synced 2025-08-20 14:31:47 +00:00
45 lines
1.4 KiB
Diff
45 lines
1.4 KiB
Diff
From cce405fda6d8b99b4b692c33bd66bd510afd9780 Mon Sep 17 00:00:00 2001
|
|
From: q66 <q66@chimera-linux.org>
|
|
Date: Sat, 18 Nov 2023 14:03:42 +0100
|
|
Subject: [PATCH 07/11] fix rustdoc when cross-compiling
|
|
|
|
---
|
|
src/bootstrap/bin/rustdoc.rs | 7 ++-----
|
|
1 file changed, 2 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/src/bootstrap/bin/rustdoc.rs b/src/bootstrap/bin/rustdoc.rs
|
|
index 6561c1c19..3bd7ee106 100644
|
|
--- a/src/bootstrap/bin/rustdoc.rs
|
|
+++ b/src/bootstrap/bin/rustdoc.rs
|
|
@@ -25,9 +25,6 @@ fn main() {
|
|
// is passed (a bit janky...)
|
|
let target = args.windows(2).find(|w| &*w[0] == "--target").and_then(|w| w[1].to_str());
|
|
|
|
- let mut dylib_path = dylib_path();
|
|
- dylib_path.insert(0, PathBuf::from(libdir.clone()));
|
|
-
|
|
let mut cmd = Command::new(rustdoc);
|
|
|
|
if target.is_some() {
|
|
@@ -40,7 +37,7 @@ fn main() {
|
|
}
|
|
|
|
cmd.args(&args);
|
|
- cmd.env(dylib_path_var(), env::join_paths(&dylib_path).unwrap());
|
|
+ cmd.env(dylib_path_var(), PathBuf::from(libdir.clone()));
|
|
|
|
// Force all crates compiled by this compiler to (a) be unstable and (b)
|
|
// allow the `rustc_private` feature to link to other unstable crates
|
|
@@ -72,7 +69,7 @@ fn main() {
|
|
eprintln!(
|
|
"rustdoc command: {:?}={:?} {:?}",
|
|
dylib_path_var(),
|
|
- env::join_paths(&dylib_path).unwrap(),
|
|
+ PathBuf::from(libdir.clone()),
|
|
cmd,
|
|
);
|
|
eprintln!("sysroot: {sysroot:?}");
|
|
--
|
|
2.42.1
|
|
|