glibc: fix libdir/libexecdir path confusion

$libdir/glibc is deleted if it doesn't exist but this is incorrectly assuming
what variables are used to create this directory.  In fact libexecdir is being
used in the Makefile so use that in the recipe too.

This fixes builds where libexecdir is changed.

Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index 5f6036840fcf55f39ca2656dded2b12e56af7b6f..36c5350896290abb8e39600617f912eda7bddbd7 100644 (file)
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -82,9 +82,10 @@ do_install_append () {
        rm -rf ${D}${localstatedir}
 
        # remove empty glibc dir
-       if [ -d ${D}${libdir}/glibc -a ! -e ${D}${libdir}/glibc/pt_chown ]; then
-               rmdir ${D}${libdir}/glibc
+       if [ -d ${D}${libexecdir} ]; then
+               rmdir --ignore-fail-on-non-empty ${D}${libexecdir}
        fi
+
        oe_multilib_header bits/syscall.h
 
        if [ -f ${D}${bindir}/mtrace ]; then