From 4535469d5953b94c9dcad5515be9b807ea7ba621 Mon Sep 17 00:00:00 2001 From: Rasmus Villemoes Date: Mon, 20 Jan 2020 09:23:06 +0000 Subject: glibc: don't ignore global LDFLAGS settings Two things: The -Wl,-rpath-link comment is stale (due to per-recipe staging), so we no longer need to set our own LDFLAGS to avoid -Wl,-rpath-link being in there. Second, overriding LDFLAGS should be done at the recipe level so "bitbake -e" can show what is going on. Otherwise debugging why one's global LDFLAGS tweaks are being ignored is needlessly painful. So pull out the LDFLAGS setting from do_compile, and change it to an append instead of assignment. For the benefit of future git blame: the -fuse-ld=bfd setting was added by ac64c3b96b (glibc: always use bfd linker). Signed-off-by: Rasmus Villemoes Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc_2.31.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'meta/recipes-core') diff --git a/meta/recipes-core/glibc/glibc_2.31.bb b/meta/recipes-core/glibc/glibc_2.31.bb index 9f299a7bc3..2032311b27 100644 --- a/meta/recipes-core/glibc/glibc_2.31.bb +++ b/meta/recipes-core/glibc/glibc_2.31.bb @@ -91,9 +91,8 @@ do_configure () { CPPFLAGS="" oe_runconf } +LDFLAGS += "-fuse-ld=bfd" do_compile () { - # -Wl,-rpath-link /lib in LDFLAGS can cause breakage if another glibc is in staging - LDFLAGS="-fuse-ld=bfd" base_do_compile echo "Adjust ldd script" if [ -n "${RTLDLIST}" ] -- cgit 1.2.3-korg