diff options
author | Samuel Holland <samuel@sholland.org> | 2018-09-19 02:31:46 +0000 |
---|---|---|
committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-09-25 00:08:16 +0000 |
commit | cd980d29292f8f5d6bb8bef5773ce91b95bfb90a (patch) | |
tree | 7eeb0fd1825894538eea675625a9f3009f3fca9d /user/rust/0008-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch | |
parent | 63266fdc6f2014cc6dfd0f983e13de7c378bc708 (diff) | |
download | packages-cd980d29292f8f5d6bb8bef5773ce91b95bfb90a.tar.gz packages-cd980d29292f8f5d6bb8bef5773ce91b95bfb90a.tar.bz2 packages-cd980d29292f8f5d6bb8bef5773ce91b95bfb90a.tar.xz packages-cd980d29292f8f5d6bb8bef5773ce91b95bfb90a.zip |
user/rust: new package
Diffstat (limited to 'user/rust/0008-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch')
-rw-r--r-- | user/rust/0008-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/user/rust/0008-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch b/user/rust/0008-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch new file mode 100644 index 000000000..7dbd51a92 --- /dev/null +++ b/user/rust/0008-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch @@ -0,0 +1,36 @@ +From 8b418c37f13710085f9a0c0c70904ad07e799c3f Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Sat, 2 Dec 2017 17:25:44 -0600 +Subject: [PATCH 08/28] 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 | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/src/bootstrap/bin/rustdoc.rs b/src/bootstrap/bin/rustdoc.rs +index a54e58665c..fc0cf940e2 100644 +--- a/src/bootstrap/bin/rustdoc.rs ++++ b/src/bootstrap/bin/rustdoc.rs +@@ -34,9 +34,6 @@ 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("--cfg") +@@ -46,7 +43,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 +-- +2.18.0 + |