[oe-commits] [openembedded-core] 01/13: glibc: don't ignore global LDFLAGS settings

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 85fb7b65b88ef03e56b697b670b665813ab22101
Author: Rasmus Villemoes <rasmus.villemoes at prevas.dk>
AuthorDate: Mon Jan 20 09:23:06 2020 +0000

    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 <rasmus.villemoes at prevas.dk>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-core/glibc/glibc_2.31.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/meta/recipes-core/glibc/glibc_2.31.bb b/meta/recipes-core/glibc/glibc_2.31.bb
index 9f299a7..2032311 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 <staging>/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}" ]

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.