gcompat: Fix build when usrmerge distro feature is enabled

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>

diff --git a/meta/recipes-core/musl/gcompat_git.bb b/meta/recipes-core/musl/gcompat_git.bb
index 962bcd8c75fbd78c32ec2726102833708385e519..b051e43b6ceb535c7cd1efe39acab02fdee97bd2 100644 (file)
--- 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"