aboutsummaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPhil Blundell <pb@pbcl.net>2013-05-02 13:19:25 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-03 16:15:28 +0100
commit507e14ecdc5b4ff2ee7f1128d9f30c2948e10d5a (patch)
tree712030c5373ccc9f72dd5eb54b3049f345766581 /meta
parentcd90be31571178d6822dba5a94a2795209a3576c (diff)
downloadopenembedded-core-contrib-507e14ecdc5b4ff2ee7f1128d9f30c2948e10d5a.tar.gz
openembedded-core-contrib-507e14ecdc5b4ff2ee7f1128d9f30c2948e10d5a.tar.bz2
openembedded-core-contrib-507e14ecdc5b4ff2ee7f1128d9f30c2948e10d5a.zip
gcc-runtime: Avoid error when trying to remove nonexistent directories
If we didn't build libgomp then we won't have installed anything into ${infodir} or ${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude. Check whether those directories exist before trying to remove them, else we will lose. Signed-off-by: Phil Blundell <philb@gnu.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/gcc/gcc-configure-runtime.inc8
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc b/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
index a9f77d9b64..977a98a377 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
@@ -43,8 +43,12 @@ do_install () {
oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/$target/$d/ install
done
rm -rf ${D}${infodir}/libgomp.info ${D}${infodir}/dir
- rmdir --ignore-fail-on-non-empty -p ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude
- rmdir --ignore-fail-on-non-empty -p ${D}${infodir}
+ if [ -d ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude ]; then
+ rmdir --ignore-fail-on-non-empty -p ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude
+ fi
+ if [ -d ${D}${infodir} ]; then
+ rmdir --ignore-fail-on-non-empty -p ${D}${infodir}
+ fi
chown -R root:root ${D}
}