From e066018fc40a37267d5cbaed6245382d1215ee15 Mon Sep 17 00:00:00 2001 From: Marat Safin Date: Fri, 18 Jan 2019 12:37:41 +0300 Subject: community/rust: upgrade to 1.32.0 Signed-off-by: Marat Safin Closes GH-6071 --- community/rust/alpine-change-rpath-to-rustlib.patch | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'community/rust/alpine-change-rpath-to-rustlib.patch') 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 { -- cgit v1.2.3