diff options
author | Samuel Holland <samuel@sholland.org> | 2022-04-30 04:27:44 +0000 |
---|---|---|
committer | Zach van Rijn <me@zv.io> | 2022-10-21 18:34:01 -0500 |
commit | 36ba9dd47f31bfbe4811b03df9a2871c43857219 (patch) | |
tree | 2637bf028a2ab8f6e4598f11b1afb84824fdcb64 /user/rust/0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch | |
parent | 04e62b2391dc7f829349c87e1cc71597731e3c88 (diff) | |
download | packages-36ba9dd47f31bfbe4811b03df9a2871c43857219.tar.gz packages-36ba9dd47f31bfbe4811b03df9a2871c43857219.tar.bz2 packages-36ba9dd47f31bfbe4811b03df9a2871c43857219.tar.xz packages-36ba9dd47f31bfbe4811b03df9a2871c43857219.zip |
user/rust: Bump to 1.60.0
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 | 45 |
1 files changed, 0 insertions, 45 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 deleted file mode 100644 index 347e0d362..000000000 --- a/user/rust/0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch +++ /dev/null @@ -1,45 +0,0 @@ -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/18] 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 | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/src/bootstrap/bin/rustdoc.rs b/src/bootstrap/bin/rustdoc.rs -index ff38ee8788f..184c9b16562 100644 ---- a/src/bootstrap/bin/rustdoc.rs -+++ b/src/bootstrap/bin/rustdoc.rs -@@ -24,9 +24,6 @@ fn main() { - Err(_) => 0, - }; - -- let mut dylib_path = bootstrap::util::dylib_path(); -- dylib_path.insert(0, PathBuf::from(libdir.clone())); -- - //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() { - .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 -@@ -87,7 +84,7 @@ fn main() { - eprintln!( - "rustdoc command: {:?}={:?} {:?}", - bootstrap::util::dylib_path_var(), -- env::join_paths(&dylib_path).unwrap(), -+ PathBuf::from(libdir.clone()), - cmd, - ); - eprintln!("sysroot: {:?}", sysroot); --- -2.21.0 - |