external-csl-toolchain: correct binary packaging

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

Signed-off-by: Christopher Larson <chris_larson@mentor.com>

diff --git a/meta/recipes-core/meta/external-csl-toolchain.bb b/meta/recipes-core/meta/external-csl-toolchain.bb
index 7dd8da2630cd68f0750c8d96b0c173218acb9522..fc35acbb939e172bfcf7a38cbebae6a9ce5310e7 100644 (file)
--- 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