gcc-package-cross: Cope with lib64 binaries

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

1 files changed, 7 insertions, 4 deletions

diff --git a/meta/packages/gcc/gcc-package-cross.inc b/meta/packages/gcc/gcc-package-cross.inc
index b95ef88e6f..9e54af8564 100644
--- a/meta/packages/gcc/gcc-package-cross.inc
+++ b/meta/packages/gcc/gcc-package-cross.inc
@@ -25,9 +25,10 @@ do_install () {
                 :
         elif [ -f ${D}${prefix}/lib/libgcc_s.so.? ]; then
                 mv -f ${D}${prefix}/lib/libgcc_s.so* ${D}${target_base_libdir} || true
-
         elif [  -f ${D}${prefix}/*/lib/nof/libgcc_s.so.? ]; then
                 mv -f ${D}${prefix}/*/lib/nof/libgcc_s.so* ${D}${target_base_libdir}
+        elif [  -f ${D}${prefix}/*/lib64/libgcc_s.so.? ]; then
+                mv -f ${D}${prefix}/*/lib64/libgcc_s.so* ${D}${target_base_libdir} || true 
         else
                 mv -f ${D}${prefix}/*/lib/libgcc_s.so* ${D}${target_base_libdir} || true 
         fi
@@ -43,7 +44,11 @@ do_install () {
            mv -f ${D}${prefix}/*/lib/nof/libg2c.so* ${D}${target_libdir} || true
            mv -f ${D}${prefix}/*/lib/nof/libgfortran*.so* ${D}${target_libdir} || true
            mv -f ${D}${prefix}/*/lib/nof/libssp*.so* ${D}${target_libdir} || true       
-
+        elif [ -f ${D}${prefix}/*/lib64/libstdc++.so ]; then
+           mv -f ${D}${prefix}/*/lib64/libstdc++.so* ${D}${target_libdir} || true
+           mv -f ${D}${prefix}/*/lib64/libg2c.so* ${D}${target_libdir} || true
+           mv -f ${D}${prefix}/*/lib64/libgfortran*.so* ${D}${target_libdir} || true
+           mv -f ${D}${prefix}/*/lib64/libssp*.so* ${D}${target_libdir} || true
         else
            mv -f ${D}${prefix}/*/lib/libstdc++.so* ${D}${target_libdir} || true
            mv -f ${D}${prefix}/*/lib/libg2c.so* ${D}${target_libdir} || true
@@ -51,8 +56,6 @@ do_install () {
            mv -f ${D}${prefix}/*/lib/libssp*.so* ${D}${target_libdir} || true
         fi
 
-
-
        # Manually run the target stripper since we won't get it run by
        # the packaging.
        if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then