summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/gcc/gcc-package-sdk.inc11
1 files changed, 6 insertions, 5 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-package-sdk.inc b/meta/recipes-devtools/gcc/gcc-package-sdk.inc
index 95d6804e9..0cf62f113 100644
--- a/meta/recipes-devtools/gcc/gcc-package-sdk.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-sdk.inc
@@ -47,11 +47,12 @@ do_install () {
rm -f ${D}${libdir}/libiberty.a
# Cleanup empty directories which are not shipped
- # we use rmdir instead of 'rm -f' to ensure the directories are empty
- rmdir ${D}${libdir}/../lib
- rmdir ${D}${prefix}/${TARGET_SYS}/lib
- rmdir ${D}${prefix}/${TARGET_SYS}
- rmdir ${D}${includedir}
+ # we use rmdir instead of 'rm -f' to ensure the non empty directories are not deleted
+ # ${D}${libdir}/../lib only seems to appear with SDKMACHINE=i686
+ local empty_dirs="${D}${libdir}/../lib ${D}${prefix}/${TARGET_SYS}/lib ${D}${prefix}/${TARGET_SYS} ${D}${includedir}"
+ for i in $empty_dirs; do
+ [ -d $i ] && rmdir --ignore-fail-on-non-empty $i
+ done
# Insert symlinks into libexec so when tools without a prefix are searched for, the correct ones are
# found.