diff options
| author | Marat Safin <jeizsm@gmail.com> | 2019-01-18 12:37:41 +0300 |
|---|---|---|
| committer | Kevin Daudt <kdaudt@alpinelinux.org> | 2019-05-23 19:38:12 +0000 |
| commit | e066018fc40a37267d5cbaed6245382d1215ee15 (patch) | |
| tree | bd0999e1e2c390216c7763a4f9788d7025f5ff33 /community/rust/alpine-change-rpath-to-rustlib.patch | |
| parent | 59c72398df08141f4177bd93f513451e16d90480 (diff) | |
| download | aports-e066018fc40a37267d5cbaed6245382d1215ee15.tar.bz2 aports-e066018fc40a37267d5cbaed6245382d1215ee15.tar.xz | |
community/rust: upgrade to 1.32.0
Signed-off-by: Marat Safin <jeizsm@gmail.com>
Closes GH-6071
Diffstat (limited to 'community/rust/alpine-change-rpath-to-rustlib.patch')
| -rw-r--r-- | community/rust/alpine-change-rpath-to-rustlib.patch | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/community/rust/alpine-change-rpath-to-rustlib.patch b/community/rust/alpine-change-rpath-to-rustlib.patch index 609fdde358..3eb1a5d02e 100644 --- a/community/rust/alpine-change-rpath-to-rustlib.patch +++ b/community/rust/alpine-change-rpath-to-rustlib.patch @@ -24,13 +24,15 @@ Related upstream issues: --- a/src/bootstrap/bin/rustc.rs +++ b/src/bootstrap/bin/rustc.rs -@@ -224,9 +224,9 @@ +@@ -224,11 +224,11 @@ // 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") && !target.contains("wasm32") { + } else if !target.contains("windows") && + !target.contains("wasm32") && + !target.contains("fuchsia") { - Some("-Wl,-rpath,$ORIGIN/../lib") + Some(format!("-Wl,-rpath,$ORIGIN/../lib/rustlib/{}/lib", target)) } else { |