binutils.inc: Switch to TARGET_PREFIX not TARGET_SYS

When TARGET_PREFIX and TARGET_SYS didn't match up, the symlinks and
update-alternatives weren't working.  TARGET_PREFIX is what we use when
configuring so it's what we should be using here.

This is 79b497edc0ce5d54db564818e59b690d3391d6ce from OE.

(From OE-Core rev: 371205d21723ec911a77d5e7c1ef51fb26d854f5)

Signed-off-by: Tom Rini <tom_rini@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 5 insertions, 5 deletions

diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc
index d9e859ef2b..882fe7b5cb 100644
--- a/meta/recipes-devtools/binutils/binutils.inc
+++ b/meta/recipes-devtools/binutils/binutils.inc
@@ -110,7 +110,7 @@ do_install () {
 
         # Symlinks for ease of running these on the native target
         for p in ${TARGET_SYS}-* ; do
-                ln -sf $p `echo $p | sed -e s,${TARGET_SYS}-,,`
+                ln -sf $p `echo $p | sed -e s,${TARGET_PREFIX},,`
         done
 
         rm ${D}${bindir}/ar ${D}${bindir}/strings
@@ -139,11 +139,11 @@ do_install_virtclass-native () {
 }
 
 pkg_postinst_${PN}-symlinks () {
-        update-alternatives --install ${bindir}/ar ar ${TARGET_SYS}-ar 100
-        update-alternatives --install ${bindir}/strings strings ${TARGET_SYS}-strings 100
+        update-alternatives --install ${bindir}/ar ar ${TARGET_PREFIX}ar 100
+        update-alternatives --install ${bindir}/strings strings ${TARGET_PREFIX}strings 100
 }
 
 pkg_prerm_${PN}-symlinks () {
-        update-alternatives --remove ar ${TARGET_SYS}-ar
-        update-alternatives --remove strings ${TARGET_SYS}-strings
+        update-alternatives --remove ar ${TARGET_PREFIX}ar
+        update-alternatives --remove strings ${TARGET_PREFIX}strings
 }