summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/gcc/libgcc-common.inc
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2022-07-24 08:35:45 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-07-25 22:59:00 +0100
commita52a230540c8800f3875ad1fda350ac59fdffde3 (patch)
tree8d1fba752d91801dac957f99adbf71341e1b0e2b /meta/recipes-devtools/gcc/libgcc-common.inc
parent591f14c698f43ca4ae6431c8cd96225d1ed5dbf5 (diff)
downloadpoky-a52a230540c8800f3875ad1fda350ac59fdffde3.tar.gz
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: 3b7f6b0e0f1f16f89cd924aac001b4f661c145ca) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc/libgcc-common.inc')
-rw-r--r--meta/recipes-devtools/gcc/libgcc-common.inc8
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 fbeb43d718..cf8d6b7ed6 100644
--- a/meta/recipes-devtools/gcc/libgcc-common.inc
+++ b/meta/recipes-devtools/gcc/libgcc-common.inc
@@ -45,10 +45,14 @@ do_install () {
45} 45}
46 46
47do_install:append:libc-baremetal () { 47do_install:append:libc-baremetal () {
48 rmdir ${D}${base_libdir} 48 if [ "${base_libdir}" != "${libdir}" ]; then
49 rmdir ${D}${base_libdir}
50 fi
49} 51}
50do_install:append:libc-newlib () { 52do_install:append:libc-newlib () {
51 rmdir ${D}${base_libdir} 53 if [ "${base_libdir}" != "${libdir}" ]; then
54 rmdir ${D}${base_libdir}
55 fi
52} 56}
53 57
54# No rpm package is actually created but -dev depends on it, avoid dnf error 58# No rpm package is actually created but -dev depends on it, avoid dnf error