diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2022-07-24 08:35:45 -0700 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2022-08-02 08:02:56 -1000 |
| commit | 38fb876253e28577b8fcf4dd47fbb1d0673c6220 (patch) | |
| tree | f0d42dd3928222339ae407ae4dd03d29e8a59b7a | |
| parent | fd5689696731fefa0d035fde86f27a0135dc31f1 (diff) | |
| download | openembedded-core-38fb876253e28577b8fcf4dd47fbb1d0673c6220.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
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>
| -rw-r--r-- | meta/recipes-devtools/gcc/libgcc-common.inc | 8 |
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 |