Patchwork [16/20] binutils.inc: Switch to TARGET_PREFIX not TARGET_SYS

login
register
mail settings
Submitter Saul Wold
Date May 9, 2011, 6:59 a.m.
Message ID <371205d21723ec911a77d5e7c1ef51fb26d854f5.1304924223.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/3439/
State New, archived
Headers show

Comments

Saul Wold - May 9, 2011, 6:59 a.m.
From: Tom Rini <tom_rini@mentor.com>

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.

Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
 meta/recipes-devtools/binutils/binutils.inc |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Patch

diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc
index d9e859e..882fe7b 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
 }