summaryrefslogtreecommitdiff
path: root/user/rust/0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch
diff options
context:
space:
mode:
authorCyberLeo <cyberleo@cyberleo.net>2020-03-28 05:45:52 -0500
committerCyberLeo <cyberleo@cyberleo.net>2020-03-28 05:45:52 -0500
commit9297468fa579836e3a6a381b798feb6b78217c2d (patch)
tree53168212f427afbcf0693b534530a4af803152e9 /user/rust/0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch
parenta63cc05c53a6f4c22422dc8c69808b14d87a6f6e (diff)
parentda5a69b65a8791fffa6e93366ee585f87eff136d (diff)
downloadpackages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.gz
packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.bz2
packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.xz
packages-9297468fa579836e3a6a381b798feb6b78217c2d.zip
Merge branch 'master' into zfs
Diffstat (limited to 'user/rust/0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch')
-rw-r--r--user/rust/0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/user/rust/0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch b/user/rust/0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch
index cf07c76d2..347e0d362 100644
--- a/user/rust/0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch
+++ b/user/rust/0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch
@@ -1,7 +1,7 @@
-From 2200debf48b6ef4c87e258cf8a968a89903f8723 Mon Sep 17 00:00:00 2001
+From 9cf754ab1d6ad14f0c95b3c18c4997ee655e62ed 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/16] Allow rustdoc to work when cross-compiling on musl
+Subject: [PATCH 03/18] Allow rustdoc to work when cross-compiling on musl
musl can't handle foreign-architecture libraries in LD_LIBRARY_PATH.
---
@@ -9,10 +9,10 @@ musl can't handle foreign-architecture libraries in LD_LIBRARY_PATH.
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/bootstrap/bin/rustdoc.rs b/src/bootstrap/bin/rustdoc.rs
-index 1c9f6e1ab28..7e90be8d8cc 100644
+index ff38ee8788f..184c9b16562 100644
--- a/src/bootstrap/bin/rustdoc.rs
+++ b/src/bootstrap/bin/rustdoc.rs
-@@ -23,9 +23,6 @@ fn main() {
+@@ -24,9 +24,6 @@ fn main() {
Err(_) => 0,
};
@@ -22,7 +22,7 @@ index 1c9f6e1ab28..7e90be8d8cc 100644
//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() {
+@@ -38,7 +35,7 @@ fn main() {
.arg("--sysroot")
.arg(&sysroot)
.env(bootstrap::util::dylib_path_var(),
@@ -31,7 +31,7 @@ index 1c9f6e1ab28..7e90be8d8cc 100644
// 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() {
+@@ -87,7 +84,7 @@ fn main() {
eprintln!(
"rustdoc command: {:?}={:?} {:?}",
bootstrap::util::dylib_path_var(),