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

(From OE-Core rev: 38fb876253e28577b8fcf4dd47fbb1d0673c6220)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 3b7f6b0e0f1f16f89cd924aac001b4f661c145ca)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 6 insertions, 2 deletions

diff --git a/meta/recipes-devtools/gcc/libgcc-common.inc b/meta/recipes-devtools/gcc/libgcc-common.inc
index d48dc8b823..31f629acaa 100644
--- 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