forked from kiss-community/repo
46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
|
From 681f46ea92719a419c3dadbe3376062cc5bde8b8 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Samuel Holland <samuel@sholland.org>
|
||
|
|
Date: Sat, 2 Dec 2017 17:25:44 -0600
|
||
|
|
Subject: [PATCH 03/12] Allow rustdoc to work when cross-compiling on musl
|
||
|
|
|
||
|
|
musl can't handle foreign-architecture libraries in LD_LIBRARY_PATH.
|
||
|
|
---
|
||
|
|
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 1c9f6e1ab..7e90be8d8 100644
|
||
|
|
--- a/src/bootstrap/bin/rustdoc.rs
|
||
|
|
+++ b/src/bootstrap/bin/rustdoc.rs
|
||
|
|
@@ -23,9 +23,6 @@ fn main() {
|
||
|
|
Err(_) => 0,
|
||
|
|
};
|
||
|
|
|
||
|
|
- let mut dylib_path = bootstrap::util::dylib_path();
|
||
|
|
- dylib_path.insert(0, PathBuf::from(libdir.clone()));
|
||
|
|
-
|
||
|
|
//FIXME(misdreavus): once stdsimd uses cfg(rustdoc) instead of cfg(dox), remove the `--cfg dox`
|
||
|
|
//arguments here
|
||
|
|
let mut cmd = Command::new(rustdoc);
|
||
|
|
@@ -37,7 +34,7 @@ fn main() {
|
||
|
|
.arg("--sysroot")
|
||
|
|
.arg(&sysroot)
|
||
|
|
.env(bootstrap::util::dylib_path_var(),
|
||
|
|
- env::join_paths(&dylib_path).unwrap());
|
||
|
|
+ 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
|
||
|
|
@@ -86,7 +83,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.22.0
|
||
|
|
|