From: Eric Bénard <eric@eukrea.com>
Date: Sun, 1 Apr 2012 13:15:04 +0000 (+0200)
Subject: bootloaders: fix linking when ld-is-gold
X-Git-Tag: 2.1~1876
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=1b183d45fce880eb37fb34a9500722c16dca753b;p=meta-freescale.git

bootloaders: fix linking when ld-is-gold

Signed-off-by: Eric Bénard <eric@eukrea.com>
---

diff --git a/meta-fsl-arm/recipes-bsp/barebox/barebox.inc b/meta-fsl-arm/recipes-bsp/barebox/barebox.inc
index 1272259f..5902f157 100644
--- a/meta-fsl-arm/recipes-bsp/barebox/barebox.inc
+++ b/meta-fsl-arm/recipes-bsp/barebox/barebox.inc
@@ -26,6 +26,9 @@ do_configure_prepend() {
 }
 
 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' Makefile
+	fi
 	unset LDFLAGS
 	unset CFLAGS
 	unset CPPFLAGS
diff --git a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx_2009.08.bb b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx_2009.08.bb
index 3471d36e..02f2e3e6 100644
--- a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx_2009.08.bb
+++ b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx_2009.08.bb
@@ -16,3 +16,9 @@ SRC_URI = "git://opensource.freescale.com/pub/scm/imx/uboot-imx.git;tag=rel_imx_
 S = "${WORKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+do_compile_prepend() {
+	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
+	fi
+}
diff --git a/meta-fsl-arm/recipes-bsp/u-boot/u-boot_git.bb b/meta-fsl-arm/recipes-bsp/u-boot/u-boot_git.bb
index 112f6fae..7c1febf4 100644
--- a/meta-fsl-arm/recipes-bsp/u-boot/u-boot_git.bb
+++ b/meta-fsl-arm/recipes-bsp/u-boot/u-boot_git.bb
@@ -22,3 +22,9 @@ SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git \
 S = "${WORKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+do_compile_prepend() {
+	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
+	fi
+}