summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Goodbody <andrew.goodbody@cambrionix.com>2016-08-31 15:05:56 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-03 23:45:53 +0100
commit34d0cf33649611bd7b368c231e3b00e30d92f58e (patch)
tree951acff684c2cdce3aac1657ec020fed7354b515
parent180eebf97663824853d40379299868aa120a4319 (diff)
downloadpoky-34d0cf33649611bd7b368c231e3b00e30d92f58e.tar.gz
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. (From OE-Core rev: 32ba805e4ffbfcb17380ed6b5164e5b25a62f330) Signed-off-by: Andrew Goodbody <andrew.goodbody@cambrionix.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-bsp/u-boot/u-boot.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index 9e19c4f70f..915da8e744 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}"
67 67
68do_compile () { 68do_compile () {
69 if [ "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then 69 if [ "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then
70 sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' config.mk 70 sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' ${S}/config.mk
71 fi 71 fi
72 72
73 unset LDFLAGS 73 unset LDFLAGS