]> code.ossystems Code Review - openembedded-core.git/commitdiff
Fix out of tree builds of u-boot with gold linker
authorAndrew Goodbody <andrew.goodbody@cambrionix.com>
Wed, 31 Aug 2016 14:05:56 +0000 (15:05 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 3 Sep 2016 22:45:45 +0000 (23:45 +0100)
Need to reference config.mk file in source tree which is no longer
the current directory when using out of tree builds.

Signed-off-by: Andrew Goodbody <andrew.goodbody@cambrionix.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-bsp/u-boot/u-boot.inc

index 9e19c4f70fa5423f0cd1ddf973e082df209d88fc..915da8e744be3508b538946f4693e4fd4ac8dd9a 100644 (file)
@@ -67,7 +67,7 @@ UBOOT_ENV_SYMLINK ?= "${UBOOT_ENV}-${MACHINE}.${UBOOT_ENV_SUFFIX}"
 
 do_compile () {
        if [ "${@bb.utils.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' ${S}/config.mk
        fi
 
        unset LDFLAGS