From aaff27833d575056e0fab51f1d0dc28c42ca6659 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Tue, 7 May 2019 22:17:42 +0200 Subject: [PATCH] rust: Avoid linking against libstdc++ All C++ code should link against libc++_shared to avoid mixing C++ standard library issues. This fixes librustc_codegen_llvm-llvm.so to do that. --- packages/rust/src-librustc_llvm-build.rs.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 packages/rust/src-librustc_llvm-build.rs.patch diff --git a/packages/rust/src-librustc_llvm-build.rs.patch b/packages/rust/src-librustc_llvm-build.rs.patch new file mode 100644 index 000000000..a78532744 --- /dev/null +++ b/packages/rust/src-librustc_llvm-build.rs.patch @@ -0,0 +1,12 @@ +diff -u -r ../rustc-1.34.1-src/src/librustc_llvm/build.rs ./src/librustc_llvm/build.rs +--- ../rustc-1.34.1-src/src/librustc_llvm/build.rs 2019-04-24 21:07:08.000000000 +0000 ++++ ./src/librustc_llvm/build.rs 2019-05-05 20:56:34.090330174 +0000 +@@ -244,6 +244,8 @@ + "c++" + } else if target.contains("darwin") { + "c++" ++ } else if target.contains("android") { ++ "c++_shared" + } else if target.contains("netbsd") && llvm_static_stdcpp.is_some() { + // NetBSD uses a separate library when relocation is required + "stdc++_pic"