libgcc: Fix standalone target builds with usrmerge distro feature

Ignore the rmdir cmd if using usrmerge distro feature since the
intention is to delete /lib or /lib64 but not libdir under /usr and
base_libdir = libdir when usrmerge is enabled in distro

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/gcc/libgcc-common.inc b/meta/recipes-devtools/gcc/libgcc-common.inc
index fbeb43d7186a51b7db294b4acbcb1992ee71e69e..cf8d6b7ed6e4ef5d1a1d9ec6ad90bdcd81bb5fc3 100644 (file)
--- a/meta/recipes-devtools/gcc/libgcc-common.inc
+++ b/meta/recipes-devtools/gcc/libgcc-common.inc
@@ -45,10 +45,14 @@ do_install () {
 }
 
 do_install:append:libc-baremetal () {
-       rmdir ${D}${base_libdir}
+       if [ "${base_libdir}" != "${libdir}" ]; then
+               rmdir ${D}${base_libdir}
+       fi
 }
 do_install:append:libc-newlib () {
-       rmdir ${D}${base_libdir}
+       if [ "${base_libdir}" != "${libdir}" ]; then
+               rmdir ${D}${base_libdir}
+       fi
 }
 
 # No rpm package is actually created but -dev depends on it, avoid dnf error