diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-28 21:00:41 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-28 21:33:58 +0100 |
| commit | a3bc5614d6a3b67b314d159d6cbbd1b71a9a2cc8 (patch) | |
| tree | d3d5288eb23cf6ca5904da86273399c4b115180f /meta/conf/bitbake.conf | |
| parent | 997d9f44eb71e58bb996107ab24710689afea047 (diff) | |
| download | poky-a3bc5614d6a3b67b314d159d6cbbd1b71a9a2cc8.tar.gz | |
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>
Diffstat (limited to 'meta/conf/bitbake.conf')
| -rw-r--r-- | meta/conf/bitbake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 618a57b602..f18e35b7eb 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
| @@ -482,7 +482,7 @@ LINKER_HASH_STYLE_mips = "sysv" | |||
| 482 | LINKER_HASH_STYLE_mipsel = "sysv" | 482 | LINKER_HASH_STYLE_mipsel = "sysv" |
| 483 | LINKER_HASH_STYLE_mips64 = "sysv" | 483 | LINKER_HASH_STYLE_mips64 = "sysv" |
| 484 | LINKER_HASH_STYLE_mips64el = "sysv" | 484 | LINKER_HASH_STYLE_mips64el = "sysv" |
| 485 | TARGET_LINK_HASH_STYLE ?= "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('LINKER_HASH_STYLE', d, True) == 'gnu']}" | 485 | TARGET_LINK_HASH_STYLE ?= "${@['-Wl,--hash-style=gnu',''][d.getVar('LINKER_HASH_STYLE', True) != 'gnu']}" |
| 486 | 486 | ||
| 487 | export LDFLAGS = "${TARGET_LDFLAGS}" | 487 | export LDFLAGS = "${TARGET_LDFLAGS}" |
| 488 | export TARGET_LDFLAGS = "-Wl,-O1 ${TARGET_LINK_HASH_STYLE}" | 488 | export TARGET_LDFLAGS = "-Wl,-O1 ${TARGET_LINK_HASH_STYLE}" |