summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-07-18 10:16:07 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-19 17:34:20 +0100
commit3c9206f97d014e472b9ae6ebabe830572efddeec (patch)
treecaeddb9b498edd79253baa019017915170c2e06c
parent34cd3f70aff4aa9409ff54b17b25fd2dd611108a (diff)
downloadpoky-3c9206f97d014e472b9ae6ebabe830572efddeec.tar.gz
gcc-package-target: don't fail if the .la files we try to delete are not there to start with
This fixes: | rm: cannot remove `/OE/tentacle/build/tmp-angstrom_2010_x-eglibc/work/armv7a-angstrom-linux-gnueabi/gcc-4.5-r39.1+svnr175127/image/usr/libexec/gcc/arm-angstrom-linux-gnueabi/4.5.4/*.la': No such file or directory | ERROR: Function 'do_install' failed (see /OE/tentacle/build/tmp-angstrom_2010_x-eglibc/work/armv7a-angstrom-linux-gnueabi/gcc-4.5-r39.1+svnr175127/temp/log.do_install.19514 for further information) NOTE: package gcc-4.5-r39.1+svnr175127: task do_install: Failed (From OE-Core rev: 4db073061bdd1d3361ff90d309049a1621f06704) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/gcc/gcc-package-target.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-package-target.inc b/meta/recipes-devtools/gcc/gcc-package-target.inc
index 9a91a7f39f..e6105da0e6 100644
--- a/meta/recipes-devtools/gcc/gcc-package-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-target.inc
@@ -84,7 +84,7 @@ do_install () {
84 # Cleanup some of the ${libdir}{,exec}/gcc stuff ... 84 # Cleanup some of the ${libdir}{,exec}/gcc stuff ...
85 rm -r ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/install-tools 85 rm -r ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/install-tools
86 rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/install-tools 86 rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/install-tools
87 rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/*.la 87 rm -rf ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/*.la
88 88
89 # Hack around specs file assumptions 89 # Hack around specs file assumptions
90 test -f ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs && sed -i -e '/^*cross_compile:$/ { n; s/1/0/; }' ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs 90 test -f ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs && sed -i -e '/^*cross_compile:$/ { n; s/1/0/; }' ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs