From c1fb312974b257b9a99f92dca6cc629c63e46dc6 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 2 Aug 2012 14:09:50 +0200 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-bsp/u-boot/u-boot.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/recipes-bsp') 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}" do_compile () { if [ "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then - sed -i 's/$(CROSS_COMPILE)ld/$(CROSS_COMPILE)ld.bfd/g' config.mk + sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' config.mk fi unset LDFLAGS -- cgit v1.2.3-54-g00ecf