[oe-commits] unknown gcc-package-cross.inc: re-add avr32 safeguards lost in merge

[koen commit]

gcc-package-cross.inc: re-add avr32 safeguards lost in merge

Author: koen at openembedded.org
Branch: unknown
Revision: 4a915ee0a28076c53049330f3f2e58c7b85ef7a8
ViewMTN: http://monotone.openembedded.org/revision/info/4a915ee0a28076c53049330f3f2e58c7b85ef7a8
Files:
1
packages/gcc/gcc-package-cross.inc
Diffs:

#
# mt diff -r8e07ae536c606d536f0a6f4e12a0e53136af55f5 -r4a915ee0a28076c53049330f3f2e58c7b85ef7a8
#
# 
# 
# patch "packages/gcc/gcc-package-cross.inc"
#  from [4868e1fad48ac841db93f79606eca20882683466]
#    to [e621b1fd6cde997e9c7bfcd83f0a0cbd72ba4710]
# 
============================================================
--- packages/gcc/gcc-package-cross.inc	4868e1fad48ac841db93f79606eca20882683466
+++ packages/gcc/gcc-package-cross.inc	e621b1fd6cde997e9c7bfcd83f0a0cbd72ba4710
@@ -48,7 +48,7 @@ do_install () {
         elif [  -f ${D}${prefix}/*/lib/nof/libgcc_s.so.? ]; then
                 mv -f ${D}${prefix}/*/lib/nof/libgcc_s.so* ${D}${target_base_libdir}
         else
-                mv -f ${D}${prefix}/*/lib/libgcc_s.so* ${D}${target_base_libdir}
+                mv -f ${D}${prefix}/*/lib/libgcc_s.so* ${D}${target_base_libdir} || true 
         fi
 
 
@@ -58,12 +58,12 @@ do_install () {
 
         if [ -f ${D}${prefix}/*/lib/nof/libstdc++.so ]; then
 
-           mv -f ${D}${prefix}/*/lib/nof/libstdc++.so* ${D}${target_libdir}
+           mv -f ${D}${prefix}/*/lib/nof/libstdc++.so* ${D}${target_libdir} || true
            mv -f ${D}${prefix}/*/lib/nof/libg2c.so* ${D}${target_libdir} || true
            mv -f ${D}${prefix}/*/lib/nof/libgfortran*.so* ${D}${target_libdir} || true
 
         else
-           mv -f ${D}${prefix}/*/lib/libstdc++.so* ${D}${target_libdir}
+           mv -f ${D}${prefix}/*/lib/libstdc++.so* ${D}${target_libdir} || true
            mv -f ${D}${prefix}/*/lib/libg2c.so* ${D}${target_libdir} || true
            mv -f ${D}${prefix}/*/lib/libgfortran*.so* ${D}${target_libdir} || true
         fi