[oe-commits] [openembedded-core] 38/42: Fix out of tree builds of u-boot with gold linker

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit d55ded5f9ac6504ca0435d2614c381e80b9cbf12
Author: Andrew Goodbody <andrew.goodbody at cambrionix.com>
AuthorDate: Wed Aug 31 15:05:56 2016 +0100

    Fix out of tree builds of u-boot with gold linker
    
    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 at cambrionix.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-bsp/u-boot/u-boot.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index 9e19c4f..915da8e 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.