gcompat: Fix build when usrmerge distro feature is enabled

(From OE-Core rev: 34a710cc8ebb18bb8443d635e06fefb7f6a003c2)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit b1154d5fe7e75bb46132165b13ed76ce95413b25)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/meta/recipes-core/musl/gcompat_git.bb b/meta/recipes-core/musl/gcompat_git.bb
index 962bcd8c75..b051e43b6c 100644
--- a/meta/recipes-core/musl/gcompat_git.bb
+++ b/meta/recipes-core/musl/gcompat_git.bb
@@ -37,14 +37,14 @@ do_compile () {
 }
 
 do_install () {
-        oe_runmake install 'DESTDIR=${D}'
+        oe_runmake install 'DESTDIR=${D}${root_prefix}'
         if [ "${SITEINFO_BITS}" = "64" ]; then
-                install -d ${D}/lib64
-                ln -rs ${D}${GLIBC_LDSO} ${D}/lib64/`basename ${GLIBC_LDSO}`
+                install -d ${D}${nonarch_base_libdir}${SITEINFO_BITS}
+                ln -rs ${D}${GLIBC_LDSO} ${D}${nonarch_base_libdir}${SITEINFO_BITS}/`basename ${GLIBC_LDSO}`
         fi
 }
 
-FILES:${PN} += "/lib64"
+FILES:${PN} += "${nonarch_base_libdir}${SITEINFO_BITS}"
 
 INSANE_SKIP:${PN} = "libdir"