From 1b183d45fce880eb37fb34a9500722c16dca753b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Eric=20B=C3=A9nard?= Date: Sun, 1 Apr 2012 15:15:04 +0200 Subject: [PATCH] bootloaders: fix linking when ld-is-gold MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bénard --- meta-fsl-arm/recipes-bsp/barebox/barebox.inc | 3 +++ meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx_2009.08.bb | 6 ++++++ meta-fsl-arm/recipes-bsp/u-boot/u-boot_git.bb | 6 ++++++ 3 files changed, 15 insertions(+) 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 +} -- 2.40.1