ce3b8aef99
- separate bootstrap into packages (cleans up template mess) - sync patches from chimera linux (only relevant ones) - drop bootstrap for BE ppc musl targets i don't do anymore - some minor patch updates from ericonr Closes https://github.com/void-linux/void-packages/pull/32555
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From 81ba387384e8ce0aa9bb9b4bd76014d922d85de8 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Kolesa <daniel@octaforge.org>
|
|
Date: Mon, 20 Dec 2021 01:48:14 +0100
|
|
Subject: [PATCH 7/9] 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 e4396d530..cb2312028 100644
|
|
--- a/src/bootstrap/bin/rustdoc.rs
|
|
+++ b/src/bootstrap/bin/rustdoc.rs
|
|
@@ -20,14 +20,11 @@ fn main() {
|
|
Err(_) => 0,
|
|
};
|
|
|
|
- let mut dylib_path = bootstrap::util::dylib_path();
|
|
- dylib_path.insert(0, PathBuf::from(libdir.clone()));
|
|
-
|
|
let mut cmd = Command::new(rustdoc);
|
|
cmd.args(&args)
|
|
.arg("--sysroot")
|
|
.arg(&sysroot)
|
|
- .env(bootstrap::util::dylib_path_var(), env::join_paths(&dylib_path).unwrap());
|
|
+ .env(bootstrap::util::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
|
|
@@ -60,7 +57,7 @@ fn main() {
|
|
eprintln!(
|
|
"rustdoc command: {:?}={:?} {:?}",
|
|
bootstrap::util::dylib_path_var(),
|
|
- env::join_paths(&dylib_path).unwrap(),
|
|
+ PathBuf::from(libdir.clone()),
|
|
cmd,
|
|
);
|
|
eprintln!("sysroot: {:?}", sysroot);
|
|
--
|
|
2.34.1
|
|
|