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.

(From OE-Core rev: 0c73dcb7c1c369a66e4c5804fcdd19f657426a5d)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 3 insertions, 2 deletions

diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index 5f6036840f..36c5350896 100644
--- 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