From a8684e7ee113c12d292602b84a5e81993a06f4b6 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Mon, 27 Jan 2020 15:54:12 +0000 Subject: [PATCH] glibc-sysroot-setup.inc: create /usr/lib after stash_locale_cleanup stash_locale_cleanup removes the empty /usr/lib after stashing the locale files to avoid remnant clutter, but we need it in the sysroot, so we need to move the creation of the directory after the cleanup to fix our aarch64 builds. Signed-off-by: Christopher Larson --- recipes-external/glibc/glibc-sysroot-setup.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes-external/glibc/glibc-sysroot-setup.inc b/recipes-external/glibc/glibc-sysroot-setup.inc index 6ce8633..2a46820 100644 --- a/recipes-external/glibc/glibc-sysroot-setup.inc +++ b/recipes-external/glibc/glibc-sysroot-setup.inc @@ -1,5 +1,6 @@ -SYSROOT_PREPROCESS_FUNCS += "external_toolchain_sysroot_adjust" -external_toolchain_sysroot_adjust() { +# stash_locale_cleanup removes the empty /usr/lib after stashing the locale +# files to avoid remnant clutter, but we need it in the sysroot +stash_locale_sysroot_cleanup_append() { # If the usr/lib directory doesn't exist, the toolchain fails to even # try to find crti.o in a completely different directory (usr/lib64) install -d ${SYSROOT_DESTDIR}${nonarch_libdir}