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 1272259ff4d0622ca5bf1c8fc8f33ff6003bbc76..5902f157c86e4b57c144f610dcb0c64235831623 100644 (file)
--- 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 3471d36ecdc7d49dd6390d6960fd5fa735f25565..02f2e3e632c74e4877709fdf7aad3b195bd2ef67 100644 (file)
--- 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 112f6fae2a7f677ea399b0a4f5ce0a74d489728a..7c1febf4341249179b23c0eb2e21539aa0c48267 100644 (file)
--- 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
+}