Patchwork bitbake.conf: Fix reversed linker hash style logic

login
register
mail settings
Submitter Richard Purdie
Date Sept. 28, 2011, 8 p.m.
Message ID <1317240048.12332.57.camel@ted>
Download mbox | patch
Permalink /patch/12353/
State New, archived
Headers show

Comments

Richard Purdie - Sept. 28, 2011, 8 p.m.
The logic in the linker hash patch was reversed, only setting the 
linker style in the non-gnu cases.

Signed-off-by: Richard Purdie <richard.purdie@linux-foundation.org>

Patch

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 618a57b..f18e35b 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -482,7 +482,7 @@  LINKER_HASH_STYLE_mips = "sysv"
 LINKER_HASH_STYLE_mipsel = "sysv"
 LINKER_HASH_STYLE_mips64 = "sysv"
 LINKER_HASH_STYLE_mips64el = "sysv"
-TARGET_LINK_HASH_STYLE ?= "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('LINKER_HASH_STYLE', d, True) == 'gnu']}"
+TARGET_LINK_HASH_STYLE ?= "${@['-Wl,--hash-style=gnu',''][d.getVar('LINKER_HASH_STYLE', True) != 'gnu']}"
 
 export LDFLAGS = "${TARGET_LDFLAGS}"
 export TARGET_LDFLAGS = "-Wl,-O1 ${TARGET_LINK_HASH_STYLE}"