diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-09-28 16:46:04 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-09-28 16:46:04 +0000 |
| commit | 7f660eb77c44872fe454eaf31b543969630670f3 (patch) | |
| tree | c657ba5ee86a0f2021388bd4ff08e3b3a80dae4e /user/rust/0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch | |
| parent | d7c07ebaf84058b90112193bf3953289c280a1a6 (diff) | |
| parent | bdb273539df454bdd85dcfb37f7c0135d33477f8 (diff) | |
| download | packages-7f660eb77c44872fe454eaf31b543969630670f3.tar.gz packages-7f660eb77c44872fe454eaf31b543969630670f3.tar.bz2 packages-7f660eb77c44872fe454eaf31b543969630670f3.tar.xz packages-7f660eb77c44872fe454eaf31b543969630670f3.zip | |
Merge branch 'rust' into 'master'
user/rust: Bump to 1.37.0
See merge request adelie/packages!270
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 | 6 |
1 files changed, 3 insertions, 3 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 1d51af2d9..cf07c76d2 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 d4b81fe2c052ddd6776da36b035dbe2c2564689b Mon Sep 17 00:00:00 2001 +From 2200debf48b6ef4c87e258cf8a968a89903f8723 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/13] Allow rustdoc to work when cross-compiling on musl +Subject: [PATCH 03/16] Allow rustdoc to work when cross-compiling on musl musl can't handle foreign-architecture libraries in LD_LIBRARY_PATH. --- @@ -9,7 +9,7 @@ musl can't handle foreign-architecture libraries in LD_LIBRARY_PATH. 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/bootstrap/bin/rustdoc.rs b/src/bootstrap/bin/rustdoc.rs -index 1c9f6e1ab2..7e90be8d8c 100644 +index 1c9f6e1ab28..7e90be8d8cc 100644 --- a/src/bootstrap/bin/rustdoc.rs +++ b/src/bootstrap/bin/rustdoc.rs @@ -23,9 +23,6 @@ fn main() { |