From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 5 Sep 2018 08:50:57 +0000 (+0100)
Subject: binutils: Fix variable conflict
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~16777
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=713c83fd00ab16250f05b0c3933f0c8178b8a33e;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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 b56fcd4cd01..81ecbb50cc1 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 \