diff options
author | Samuel Holland <samuel@sholland.org> | 2019-03-21 22:34:00 -0500 |
---|---|---|
committer | Samuel Holland <samuel@sholland.org> | 2019-03-22 23:28:00 -0500 |
commit | fd100f124927cd65cf821bd5d538815e81034c1b (patch) | |
tree | 380911715310d268c8c085a5f30f45f9195dd485 /user/rust/0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch | |
parent | edffe262c383c979833766a85cd65b74fb5231fa (diff) | |
download | packages-fd100f124927cd65cf821bd5d538815e81034c1b.tar.gz packages-fd100f124927cd65cf821bd5d538815e81034c1b.tar.bz2 packages-fd100f124927cd65cf821bd5d538815e81034c1b.tar.xz packages-fd100f124927cd65cf821bd5d538815e81034c1b.zip |
user/rust: Bump to 1.33.0
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 | 12 |
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 588c4df66..c1cb5e930 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 0613fed83ccf58ce3305a1df35e31eda25ba409e Mon Sep 17 00:00:00 2001 +From 520ceedb4a6384da5c207aa434a29d68fc8e238a 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/23] Allow rustdoc to work when cross-compiling on musl +Subject: [PATCH 03/14] 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, 1 insertion(+), 4 deletions(-) diff --git a/src/bootstrap/bin/rustdoc.rs b/src/bootstrap/bin/rustdoc.rs -index bb5a21e3e4..1b6b78b90a 100644 +index dec74e60c7..af76331db0 100644 --- a/src/bootstrap/bin/rustdoc.rs +++ b/src/bootstrap/bin/rustdoc.rs -@@ -34,9 +34,6 @@ fn main() { +@@ -24,9 +24,6 @@ fn main() { Err(_) => 0, }; @@ -22,7 +22,7 @@ index bb5a21e3e4..1b6b78b90a 100644 //FIXME(misdreavus): once stdsimd uses cfg(rustdoc) instead of cfg(dox), remove the `--cfg dox` //arguments here let mut cmd = Command::new(rustdoc); -@@ -48,7 +45,7 @@ fn main() { +@@ -38,7 +35,7 @@ fn main() { .arg("--sysroot") .arg(sysroot) .env(bootstrap::util::dylib_path_var(), @@ -32,5 +32,5 @@ index bb5a21e3e4..1b6b78b90a 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 -- -2.19.2 +2.21.0 |