From 18b490b7953735328501c6f7e54522a91220caf3 Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Sat, 10 Nov 2018 22:34:26 +0000 Subject: user/rust: Bump to 1.30.1 --- ...tdoc-to-work-when-cross-compiling-on-musl.patch | 36 ---------------------- 1 file changed, 36 deletions(-) delete mode 100644 user/rust/0008-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch (limited to 'user/rust/0008-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch') 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 deleted file mode 100644 index a3caa20f5..000000000 --- a/user/rust/0008-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 3028ae603ea6f08fd6bc1c64a7fe28628a1232e9 Mon Sep 17 00:00:00 2001 -From: Samuel Holland -Date: Sat, 2 Dec 2017 17:25:44 -0600 -Subject: [PATCH 08/29] 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 - -- cgit v1.2.3-60-g2f50