From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 28 Sep 2011 20:00:41 +0000 (+0100)
Subject: bitbake.conf: Fix reversed linker hash style logic
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a3bc5614d6a3b67b314d159d6cbbd1b71a9a2cc8;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

bitbake.conf: Fix reversed linker hash style logic

The logic in the linker hash patch was reversed, only setting the
linker style in the non-gnu cases.

(From OE-Core rev: 5839702da70cec32f01e58280629f6bcf74d0034)

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

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 618a57b602d..f18e35b7eb9 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}"