diff options
| author | Rasmus Thomsen <oss@cogitri.dev> | 2019-12-19 19:34:52 +0100 |
|---|---|---|
| committer | Rasmus Thomsen <oss@cogitri.dev> | 2019-12-21 15:26:59 +0100 |
| commit | 9e720648fbe2ba938d28f85e846666699957ccc6 (patch) | |
| tree | a3a204f5fe570cd1333019ae448b1a178aadb3a1 /community/rust/alpine-change-rpath-to-rustlib.patch | |
| parent | 28bc974f9463b206e3404fbe9c0701ab8f8e264e (diff) | |
| download | aports-9e720648fbe2ba938d28f85e846666699957ccc6.tar.bz2 aports-9e720648fbe2ba938d28f85e846666699957ccc6.tar.xz | |
community/rust: upgrade to 1.40.0
Diffstat (limited to 'community/rust/alpine-change-rpath-to-rustlib.patch')
| -rw-r--r-- | community/rust/alpine-change-rpath-to-rustlib.patch | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/community/rust/alpine-change-rpath-to-rustlib.patch b/community/rust/alpine-change-rpath-to-rustlib.patch index 8e3e018500..cf2be834a4 100644 --- a/community/rust/alpine-change-rpath-to-rustlib.patch +++ b/community/rust/alpine-change-rpath-to-rustlib.patch @@ -24,7 +24,7 @@ Related upstream issues: --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs -@@ -967,11 +967,11 @@ +@@ -989,12 +989,12 @@ // so. Note that this is definitely a hack, and we should likely // flesh out rpath support more fully in the future. rustflags.arg("-Zosx-rpath-install-name"); @@ -32,6 +32,7 @@ Related upstream issues: + Some("-Wl,-rpath,@loader_path/../lib".to_string()) } else if !target.contains("windows") && !target.contains("wasm32") && + !target.contains("emscripten") && !target.contains("fuchsia") { - Some("-Wl,-rpath,$ORIGIN/../lib") + Some(format!("-Wl,-rpath,$ORIGIN/../lib/rustlib/{}/lib", target)) |