diff options
| author | Samuel Holland <samuel@sholland.org> | 2019-05-29 04:42:59 +0000 |
|---|---|---|
| committer | Samuel Holland <samuel@sholland.org> | 2019-05-29 04:46:40 +0000 |
| commit | 7e1cca3044a2ec11b12b1e0004eb59be38950bed (patch) | |
| tree | 21773e07accb1d9b9c49a95dc2975aa04867c479 /user/rust/0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch | |
| parent | d726062dd22ef3eaafd366821fb7c9dde338f060 (diff) | |
| download | packages-7e1cca3044a2ec11b12b1e0004eb59be38950bed.tar.gz packages-7e1cca3044a2ec11b12b1e0004eb59be38950bed.tar.bz2 packages-7e1cca3044a2ec11b12b1e0004eb59be38950bed.tar.xz packages-7e1cca3044a2ec11b12b1e0004eb59be38950bed.zip | |
user/rust: Bump to 1.35.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 | 21 |
1 files changed, 15 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 087dea295..1d51af2d9 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,15 +1,15 @@ -From c4565fab697249c4233c97f7855fe692a5a880a4 Mon Sep 17 00:00:00 2001 +From d4b81fe2c052ddd6776da36b035dbe2c2564689b 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 +Subject: [PATCH 03/13] 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(-) + 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 52b5971f0a..c779e35e26 100644 +index 1c9f6e1ab2..7e90be8d8c 100644 --- a/src/bootstrap/bin/rustdoc.rs +++ b/src/bootstrap/bin/rustdoc.rs @@ -23,9 +23,6 @@ fn main() { @@ -24,13 +24,22 @@ index 52b5971f0a..c779e35e26 100644 let mut cmd = Command::new(rustdoc); @@ -37,7 +34,7 @@ fn main() { .arg("--sysroot") - .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 +@@ -86,7 +83,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 |