diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-05 09:50:57 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-05 18:00:25 +0100 |
commit | bcaa35fe541ea7dafd9cadb3c89c244c35bbe0ff (patch) | |
tree | 39cfb52d890eb07a3b743ad923f2ae386a7d4c84 /meta/recipes-devtools/binutils/binutils.inc | |
parent | 341c0d7d82c8ce96d43ce51081d641afd37d4baf (diff) | |
download | poky-bcaa35fe541ea7dafd9cadb3c89c244c35bbe0ff.tar.gz |
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.
(From OE-Core rev: 713c83fd00ab16250f05b0c3933f0c8178b8a33e)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/binutils/binutils.inc')
-rw-r--r-- | meta/recipes-devtools/binutils/binutils.inc | 6 |
1 files changed, 3 insertions, 3 deletions
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 = " \ | |||
38 | # Rather than duplicating multiple entries for these, make one | 38 | # Rather than duplicating multiple entries for these, make one |
39 | # list and reuse it. | 39 | # list and reuse it. |
40 | 40 | ||
41 | LDGOLD ?= "ld.gold dwp" | 41 | LDGOLD_ALTS ?= "ld.gold dwp" |
42 | LDGOLD_riscv64 = "" | 42 | LDGOLD_ALTS_riscv64 = "" |
43 | 43 | ||
44 | USE_ALTERNATIVES_FOR = " \ | 44 | USE_ALTERNATIVES_FOR = " \ |
45 | addr2line \ | 45 | addr2line \ |
@@ -50,7 +50,7 @@ USE_ALTERNATIVES_FOR = " \ | |||
50 | gprof \ | 50 | gprof \ |
51 | ld \ | 51 | ld \ |
52 | ld.bfd \ | 52 | ld.bfd \ |
53 | ${LDGOLD} \ | 53 | ${LDGOLD_ALTS} \ |
54 | nm \ | 54 | nm \ |
55 | objcopy \ | 55 | objcopy \ |
56 | objdump \ | 56 | objdump \ |