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 <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc
index b56fcd4cd01b433500f9b06d67d6486bddac6757..81ecbb50cc1217bd4a69ce245d407db3eb86fd8b 100644 (file)
--- 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 \