diff options
-rw-r--r-- | meta/packages/gcc/gcc-package-cross.inc | 11 |
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 () { | |||
25 | : | 25 | : |
26 | elif [ -f ${D}${prefix}/lib/libgcc_s.so.? ]; then | 26 | elif [ -f ${D}${prefix}/lib/libgcc_s.so.? ]; then |
27 | mv -f ${D}${prefix}/lib/libgcc_s.so* ${D}${target_base_libdir} || true | 27 | mv -f ${D}${prefix}/lib/libgcc_s.so* ${D}${target_base_libdir} || true |
28 | |||
29 | elif [ -f ${D}${prefix}/*/lib/nof/libgcc_s.so.? ]; then | 28 | elif [ -f ${D}${prefix}/*/lib/nof/libgcc_s.so.? ]; then |
30 | mv -f ${D}${prefix}/*/lib/nof/libgcc_s.so* ${D}${target_base_libdir} | 29 | mv -f ${D}${prefix}/*/lib/nof/libgcc_s.so* ${D}${target_base_libdir} |
30 | elif [ -f ${D}${prefix}/*/lib64/libgcc_s.so.? ]; then | ||
31 | mv -f ${D}${prefix}/*/lib64/libgcc_s.so* ${D}${target_base_libdir} || true | ||
31 | else | 32 | else |
32 | mv -f ${D}${prefix}/*/lib/libgcc_s.so* ${D}${target_base_libdir} || true | 33 | mv -f ${D}${prefix}/*/lib/libgcc_s.so* ${D}${target_base_libdir} || true |
33 | fi | 34 | fi |
@@ -43,7 +44,11 @@ do_install () { | |||
43 | mv -f ${D}${prefix}/*/lib/nof/libg2c.so* ${D}${target_libdir} || true | 44 | mv -f ${D}${prefix}/*/lib/nof/libg2c.so* ${D}${target_libdir} || true |
44 | mv -f ${D}${prefix}/*/lib/nof/libgfortran*.so* ${D}${target_libdir} || true | 45 | mv -f ${D}${prefix}/*/lib/nof/libgfortran*.so* ${D}${target_libdir} || true |
45 | mv -f ${D}${prefix}/*/lib/nof/libssp*.so* ${D}${target_libdir} || true | 46 | mv -f ${D}${prefix}/*/lib/nof/libssp*.so* ${D}${target_libdir} || true |
46 | 47 | elif [ -f ${D}${prefix}/*/lib64/libstdc++.so ]; then | |
48 | mv -f ${D}${prefix}/*/lib64/libstdc++.so* ${D}${target_libdir} || true | ||
49 | mv -f ${D}${prefix}/*/lib64/libg2c.so* ${D}${target_libdir} || true | ||
50 | mv -f ${D}${prefix}/*/lib64/libgfortran*.so* ${D}${target_libdir} || true | ||
51 | mv -f ${D}${prefix}/*/lib64/libssp*.so* ${D}${target_libdir} || true | ||
47 | else | 52 | else |
48 | mv -f ${D}${prefix}/*/lib/libstdc++.so* ${D}${target_libdir} || true | 53 | mv -f ${D}${prefix}/*/lib/libstdc++.so* ${D}${target_libdir} || true |
49 | mv -f ${D}${prefix}/*/lib/libg2c.so* ${D}${target_libdir} || true | 54 | mv -f ${D}${prefix}/*/lib/libg2c.so* ${D}${target_libdir} || true |
@@ -51,8 +56,6 @@ do_install () { | |||
51 | mv -f ${D}${prefix}/*/lib/libssp*.so* ${D}${target_libdir} || true | 56 | mv -f ${D}${prefix}/*/lib/libssp*.so* ${D}${target_libdir} || true |
52 | fi | 57 | fi |
53 | 58 | ||
54 | |||
55 | |||
56 | # Manually run the target stripper since we won't get it run by | 59 | # Manually run the target stripper since we won't get it run by |
57 | # the packaging. | 60 | # the packaging. |
58 | if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then | 61 | if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then |