diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2018-05-20 10:23:04 +0200 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2018-05-20 16:46:01 +0200 |
| commit | 207941559ddce18b7b0cfeb09b7fab673233c4da (patch) | |
| tree | c28ef0367037839b5b0a071574b90f8eac7c96c4 /community/rust/alpine-change-rpath-to-rustlib.patch | |
| parent | 3dc0c1d65c029cef8d5252f3d957c64b196c35db (diff) | |
| download | aports-207941559ddce18b7b0cfeb09b7fab673233c4da.tar.bz2 aports-207941559ddce18b7b0cfeb09b7fab673233c4da.tar.xz | |
community/rust: upgrade to 1.26.0
Also switch to LLVM 5. Upstream switched right to LLVM 6, but we
don't have it yet.
Diffstat (limited to 'community/rust/alpine-change-rpath-to-rustlib.patch')
| -rw-r--r-- | community/rust/alpine-change-rpath-to-rustlib.patch | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/community/rust/alpine-change-rpath-to-rustlib.patch b/community/rust/alpine-change-rpath-to-rustlib.patch index bd65efd7d9..609fdde358 100644 --- a/community/rust/alpine-change-rpath-to-rustlib.patch +++ b/community/rust/alpine-change-rpath-to-rustlib.patch @@ -1,5 +1,6 @@ From: Jakub Jirutka <jakub@jirutka.cz> Date: Sat, 08 Aug 2016 19:56:00 +0200 +Last-Updated: Sun, 20 May 2018 00:09:00 +0200 Subject: [PATCH] Change rpath for rustc/rustdoc to rustlib/$TARGET/lib Rust installs two identical sets of *.so libraries into /usr/lib and @@ -23,11 +24,13 @@ Related upstream issues: --- a/src/bootstrap/bin/rustc.rs +++ b/src/bootstrap/bin/rustc.rs -@@ -189,7 +189,7 @@ +@@ -224,9 +224,9 @@ + // so. Note that this is definitely a hack, and we should likely + // flesh out rpath support more fully in the future. cmd.arg("-Z").arg("osx-rpath-install-name"); - Some("-Wl,-rpath,@loader_path/../lib") + Some("-Wl,-rpath,@loader_path/../lib".to_string()) - } else if !target.contains("windows") { + } else if !target.contains("windows") && !target.contains("wasm32") { - Some("-Wl,-rpath,$ORIGIN/../lib") + Some(format!("-Wl,-rpath,$ORIGIN/../lib/rustlib/{}/lib", target)) } else { |