1 files changed, 5 insertions, 2 deletions

diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index 824b185b3a..ff45dfe35a 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -207,8 +207,11 @@ do_poststash_install_cleanup () {
         rm -rf ${D}/${localedir}
         rm -rf ${D}${datadir}/locale
         if [ "${libdir}" != "${exec_prefix}/lib" ]; then
-                # This dir only exists to hold locales
-                rm -rf ${D}${exec_prefix}/lib
+                if [ -d ${D}${exec_prefix}/lib/locale ] ; then
+                        rm -rf ${D}${exec_prefix}/lib/locale
+                        # error out if directory isn't empty
+                        rm -f ${D}${exec_prefix}/lib
+                fi
         fi
 }
 addtask do_poststash_install_cleanup after do_stash_locale do_install before do_populate_sysroot do_package