[OE-core] [PATCH] u-boot.inc: fix regexp used when ld-is-gold
Martin Jansa
martin.jansa at gmail.com
Thu Aug 2 12:09:50 UTC 2012
* 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.
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
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 42bdde9..a8642f0 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
--
1.7.8.6
More information about the Openembedded-core
mailing list