external-csl-toolchain: correct binary packaging

CS puts optimized executables in usr/lib/bin, not usr/bin.

(From OE-Core rev: 25d22bfb0970f7152b678796f2282dced7230fe1)

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 6 insertions, 1 deletions

diff --git a/meta/recipes-core/meta/external-csl-toolchain.bb b/meta/recipes-core/meta/external-csl-toolchain.bb
index 7dd8da2630..fc35acbb93 100644
--- a/meta/recipes-core/meta/external-csl-toolchain.bb
+++ b/meta/recipes-core/meta/external-csl-toolchain.bb
@@ -58,7 +58,12 @@ do_install() {
 
         rm ${D}${sysconfdir}/rpc
         rm -r ${D}${datadir}/zoneinfo
-        rm -r ${D}${libdir}/bin
+
+        mv ${D}${libdir}/bin/* ${D}${bindir}/
+        if [ -e ${D}${libdir}/bin/.debug ]; then
+                install -d ${D}${bindir}/.debug
+                mv ${D}${libdir}/bin/.debug/* ${D}${bindir}/.debug/
+        fi
 
         sed -i -e "s# /lib# ../../lib#g" -e "s# /usr/lib# .#g" ${D}${libdir}/libc.so
         sed -i -e "s# /lib# ../../lib#g" -e "s# /usr/lib# .#g" ${D}${libdir}/libpthread.so