[patch] Trivial patch for >=dev-util/cargo-0.20.0 which resolves the invalid LD_LIBRARY_PATH issue that has been breaking Firefox builds

cargo-0.20.0-fix-bad-dylib-search-path.patch (text/plain), 1.24 KB, created by Psi on 2017-11-23 08:55:52 UTC

This is a trivial patch to Cargo 0.20.0 - 0.22.0 that corrects a bad path that
cargo adds to LD_LIBRARY_PATH when building for its host system.  The path can
cause binaries which contain DT_RUNPATH attributes to fail to run, in certain
circumstances.  This can break binutils' ld.bfd, causing link failures.

See PR 4006 for info on why this behavior was introduced.  This patch changes
the added path to match what the PR 4006 author originally proposed as an
alternative.

https://github.com/rust-lang/cargo/pull/4006
https://github.com/rust-lang/cargo/commit/80f19a8e240577d90caf38503bb3034ac7dd630d


diff -Nurdp a/src/cargo/ops/cargo_rustc/context.rs b/src/cargo/ops/cargo_rustc/context.rs
--- a/src/cargo/ops/cargo_rustc/context.rs	2017-10-06 07:38:28.000000000 +0000
+++ b/src/cargo/ops/cargo_rustc/context.rs	2017-11-22 22:16:19.320666523 +0000
@@ -284,6 +284,9 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
                     rustlib.push("bin");
                 } else {
                     rustlib.push("lib");
+                    rustlib.push("rustlib");
+                    rustlib.push(self.target_triple());
+                    rustlib.push("lib");
                 }
                 self.compilation.host_dylib_path = Some(rustlib);
             } else {