From 713c83fd00ab16250f05b0c3933f0c8178b8a33e Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 5 Sep 2018 09:50:57 +0100 Subject: binutils: Fix variable conflict A recent binutils patch added the LDGOLD variable but its already used for controlling EXTRA_OECONF options for gold. Separate the two variables to different names to avoid build warnings and confusion. Signed-off-by: Richard Purdie --- meta/recipes-devtools/binutils/binutils.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/recipes-devtools/binutils/binutils.inc') diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc index b56fcd4cd0..81ecbb50cc 100644 --- a/meta/recipes-devtools/binutils/binutils.inc +++ b/meta/recipes-devtools/binutils/binutils.inc @@ -38,8 +38,8 @@ FILES_${PN}-dev = " \ # Rather than duplicating multiple entries for these, make one # list and reuse it. -LDGOLD ?= "ld.gold dwp" -LDGOLD_riscv64 = "" +LDGOLD_ALTS ?= "ld.gold dwp" +LDGOLD_ALTS_riscv64 = "" USE_ALTERNATIVES_FOR = " \ addr2line \ @@ -50,7 +50,7 @@ USE_ALTERNATIVES_FOR = " \ gprof \ ld \ ld.bfd \ - ${LDGOLD} \ + ${LDGOLD_ALTS} \ nm \ objcopy \ objdump \ -- cgit 1.2.3-korg