summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRasmus Villemoes <rasmus.villemoes@prevas.dk>2020-01-20 09:23:06 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-04 15:56:29 +0000
commitb5444e5f5e8ddb4970cdfeaf801e908eaf1f8287 (patch)
treecd82523fabf7b053b3ae7815e5e601cb437491b5 /meta/recipes-core
parent30c105423576dd31187beafd93bd2e6000aa6415 (diff)
downloadpoky-b5444e5f5e8ddb4970cdfeaf801e908eaf1f8287.tar.gz
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). (From OE-Core rev: 4535469d5953b94c9dcad5515be9b807ea7ba621) Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/glibc/glibc_2.31.bb3
1 files changed, 1 insertions, 2 deletions
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 () {
91 CPPFLAGS="" oe_runconf 91 CPPFLAGS="" oe_runconf
92} 92}
93 93
94LDFLAGS += "-fuse-ld=bfd"
94do_compile () { 95do_compile () {
95 # -Wl,-rpath-link <staging>/lib in LDFLAGS can cause breakage if another glibc is in staging
96 LDFLAGS="-fuse-ld=bfd"
97 base_do_compile 96 base_do_compile
98 echo "Adjust ldd script" 97 echo "Adjust ldd script"
99 if [ -n "${RTLDLIST}" ] 98 if [ -n "${RTLDLIST}" ]