From f861211e50a185c965b818c2808bbb50765f9d6b Mon Sep 17 00:00:00 2001
From: Derek Straka <derek@asterius.io>
Date: Fri, 22 Apr 2016 11:25:06 -0400
Subject: [PATCH] rust: remove the symlinks and libs installed directly into
 libdir (#17)

Signed-off-by: Derek Straka <derek@asterius.io>
---
 recipes-devtools/rust/rust.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes-devtools/rust/rust.inc b/recipes-devtools/rust/rust.inc
index c6e3d91..8b5387e 100644
--- a/recipes-devtools/rust/rust.inc
+++ b/recipes-devtools/rust/rust.inc
@@ -470,9 +470,9 @@ rust_do_install () {
         install -m 0644 "$tgt" "$td"
     done
 
-    ## rust will complain about multiple providers of the runtime libs
-    ## (libstd, libsync, etc.) without this.
-    (cd "${D}${libdir}" && ln -sf "rustlib/${HOST_SYS}/lib/lib"*.so .)
+    # Remove any files directly installed into libdir to avoid
+    # conflicts between cross and native
+    rm -f ${D}${libdir}/lib*.so
 }
 
 do_install () {