diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2012-08-02 14:09:50 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-02 15:28:37 +0100 |
commit | c1fb312974b257b9a99f92dca6cc629c63e46dc6 (patch) | |
tree | 6b8676b45c17512b9a19aadf97aa69188d8fc5c2 /meta/recipes-bsp/u-boot/u-boot.inc | |
parent | 62d42fe3cfa575cb97b484ccf7b2e9a25cc50770 (diff) | |
download | poky-c1fb312974b257b9a99f92dca6cc629c63e46dc6.tar.gz |
u-boot.inc: fix regexp used when ld-is-gold
* with old regexp it wasn't reentrant, causing stuff like this:
-LD = $(CROSS_COMPILE)ld
+LD = $(CROSS_COMPILE)ld.bfd.bfd
-LDR = $(CROSS_COMPILE)ldr
+LDR = $(CROSS_COMPILE)ld.bfd.bfdr
when do_compile was reexecuted, also breaking LDR variable and
http://git.yoctoproject.org/cgit/cgit.cgi/meta-ti/tree/recipes-bsp/u-boot/u-boot/0001-config-Always-use-GNU-ld.patch
when it was used together with u-boot.inc from oe-core (meta-ti is using own u-boot.inc)
* This patch is also better solution to ld-is-gold problem then regexp in metadata.
(From OE-Core rev: f78044f85ab1a0acce852a7032fc0c81285cd4c1)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/u-boot/u-boot.inc')
-rw-r--r-- | meta/recipes-bsp/u-boot/u-boot.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index 42bdde9ba6..a8642f0b06 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc | |||
@@ -34,7 +34,7 @@ SPL_SYMLINK ?= "${SPL_BINARY}-${MACHINE}" | |||
34 | 34 | ||
35 | do_compile () { | 35 | do_compile () { |
36 | if [ "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then | 36 | if [ "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then |
37 | sed -i 's/$(CROSS_COMPILE)ld/$(CROSS_COMPILE)ld.bfd/g' config.mk | 37 | sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' config.mk |
38 | fi | 38 | fi |
39 | 39 | ||
40 | unset LDFLAGS | 40 | unset LDFLAGS |