diff options
author | Samuel Holland <samuel@sholland.org> | 2019-05-26 15:21:24 -0500 |
---|---|---|
committer | Samuel Holland <samuel@sholland.org> | 2019-05-29 04:38:48 +0000 |
commit | d726062dd22ef3eaafd366821fb7c9dde338f060 (patch) | |
tree | e443eb75a9559da3b883f3c8d34a3068e46992bb /user/rust/0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch | |
parent | 0ee2191bdaf224bcc5c9bd4cfd3e42e0fe5fed16 (diff) | |
download | packages-d726062dd22ef3eaafd366821fb7c9dde338f060.tar.gz packages-d726062dd22ef3eaafd366821fb7c9dde338f060.tar.bz2 packages-d726062dd22ef3eaafd366821fb7c9dde338f060.tar.xz packages-d726062dd22ef3eaafd366821fb7c9dde338f060.zip |
user/rust: Bump to 1.34.2
Signed-off-by: Samuel Holland <samuel@sholland.org>
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.patch | 8 |
1 files changed, 4 insertions, 4 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 c1cb5e930..087dea295 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,4 +1,4 @@ -From 520ceedb4a6384da5c207aa434a29d68fc8e238a Mon Sep 17 00:00:00 2001 +From c4565fab697249c4233c97f7855fe692a5a880a4 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] Allow rustdoc to work when cross-compiling on musl @@ -9,10 +9,10 @@ musl can't handle foreign-architecture libraries in LD_LIBRARY_PATH. 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/bootstrap/bin/rustdoc.rs b/src/bootstrap/bin/rustdoc.rs -index dec74e60c7..af76331db0 100644 +index 52b5971f0a..c779e35e26 100644 --- a/src/bootstrap/bin/rustdoc.rs +++ b/src/bootstrap/bin/rustdoc.rs -@@ -24,9 +24,6 @@ fn main() { +@@ -23,9 +23,6 @@ fn main() { Err(_) => 0, }; @@ -22,7 +22,7 @@ index dec74e60c7..af76331db0 100644 //FIXME(misdreavus): once stdsimd uses cfg(rustdoc) instead of cfg(dox), remove the `--cfg dox` //arguments here let mut cmd = Command::new(rustdoc); -@@ -38,7 +35,7 @@ fn main() { +@@ -37,7 +34,7 @@ fn main() { .arg("--sysroot") .arg(sysroot) .env(bootstrap::util::dylib_path_var(), |