summaryrefslogtreecommitdiff
path: root/user/rust/0003-Fix-rustdoc-when-cross-compiling-on-musl.patch
diff options
context:
space:
mode:
Diffstat (limited to 'user/rust/0003-Fix-rustdoc-when-cross-compiling-on-musl.patch')
-rw-r--r--user/rust/0003-Fix-rustdoc-when-cross-compiling-on-musl.patch42
1 files changed, 0 insertions, 42 deletions
diff --git a/user/rust/0003-Fix-rustdoc-when-cross-compiling-on-musl.patch b/user/rust/0003-Fix-rustdoc-when-cross-compiling-on-musl.patch
deleted file mode 100644
index 69dbf3530..000000000
--- a/user/rust/0003-Fix-rustdoc-when-cross-compiling-on-musl.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 41ab14f51521d94673ddae78e91611a3e7197078 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/14] Fix rustdoc 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 ad3800834b0..e19b589233e 100644
---- a/src/bootstrap/bin/rustdoc.rs
-+++ b/src/bootstrap/bin/rustdoc.rs
-@@ -22,14 +22,11 @@ fn main() {
- Err(_) => 0,
- };
-
-- let mut dylib_path = dylib_path();
-- dylib_path.insert(0, PathBuf::from(libdir.clone()));
--
- let mut cmd = Command::new(rustdoc);
- cmd.args(&args)
- .arg("--sysroot")
- .arg(&sysroot)
-- .env(dylib_path_var(), env::join_paths(&dylib_path).unwrap());
-+ .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
-@@ -62,7 +59,7 @@ fn main() {
- eprintln!(
- "rustdoc command: {:?}={:?} {:?}",
- dylib_path_var(),
-- env::join_paths(&dylib_path).unwrap(),
-+ PathBuf::from(libdir.clone()),
- cmd,
- );
- eprintln!("sysroot: {:?}", sysroot);
---
-2.35.1
-