summaryrefslogtreecommitdiff
path: root/bootstrap/rust-1.69/0003-Fix-rustdoc-when-cross-compiling-on-musl.patch
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2024-07-30 09:27:55 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2024-08-09 15:21:38 -0500
commite50c8b2647ce482654ab0e4f77a88893b497ed37 (patch)
treeeb0c442d10d190933dac120b525e6779e44ea2bd /bootstrap/rust-1.69/0003-Fix-rustdoc-when-cross-compiling-on-musl.patch
parentecce2855f3220b8b9b39c58ef05c97643fd62f1b (diff)
downloadpackages-e50c8b2647ce482654ab0e4f77a88893b497ed37.tar.gz
packages-e50c8b2647ce482654ab0e4f77a88893b497ed37.tar.bz2
packages-e50c8b2647ce482654ab0e4f77a88893b497ed37.tar.xz
packages-e50c8b2647ce482654ab0e4f77a88893b497ed37.zip
bootstrap/rust-1.{61-79}: New package
Diffstat (limited to 'bootstrap/rust-1.69/0003-Fix-rustdoc-when-cross-compiling-on-musl.patch')
-rw-r--r--bootstrap/rust-1.69/0003-Fix-rustdoc-when-cross-compiling-on-musl.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/bootstrap/rust-1.69/0003-Fix-rustdoc-when-cross-compiling-on-musl.patch b/bootstrap/rust-1.69/0003-Fix-rustdoc-when-cross-compiling-on-musl.patch
new file mode 100644
index 000000000..86068d14d
--- /dev/null
+++ b/bootstrap/rust-1.69/0003-Fix-rustdoc-when-cross-compiling-on-musl.patch
@@ -0,0 +1,42 @@
+From 05264618f6902def4daf5a5fd087d6a831e3ff57 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/13] 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 5f85fc5aa5903..01e81fc398409 100644
+--- a/src/bootstrap/bin/rustdoc.rs
++++ b/src/bootstrap/bin/rustdoc.rs
+@@ -27,9 +27,6 @@ fn main() {
+ Err(_) => 0,
+ };
+
+- let mut dylib_path = dylib_path();
+- dylib_path.insert(0, PathBuf::from(libdir.clone()));
+-
+ let mut cmd = Command::new(rustdoc);
+
+ if target.is_some() {
+@@ -42,7 +39,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
+@@ -74,7 +71,7 @@ fn main() {
+ eprintln!(
+ "rustdoc command: {:?}={:?} {:?}",
+ dylib_path_var(),
+- env::join_paths(&dylib_path).unwrap(),
++ PathBuf::from(libdir.clone()),
+ cmd,
+ );
+ eprintln!("sysroot: {:?}", sysroot);