gcc: Clean up unnecessary variable confusion

SDKPKGSUFFIX could only really be "nativesdk" and TARGET_SYS never contains
that so the code manipulating TARGET_SYS is pointless. I suspect this once
worked against MULTIMACH_TARGET_SYS which would be a different question but
it no longer does. Its been cut and pasted everywhere.

This patch cleans up the variable references to make things a little more
readable.

(From OE-Core rev: 5599cb72d17bce2ba6e2be16ef64d9a388bcfb25)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 3 insertions, 6 deletions

diff --git a/meta/recipes-devtools/gcc/libgcc-common.inc b/meta/recipes-devtools/gcc/libgcc-common.inc
index c0efc29437..848a476207 100644
--- a/meta/recipes-devtools/gcc/libgcc-common.inc
+++ b/meta/recipes-devtools/gcc/libgcc-common.inc
@@ -5,10 +5,9 @@ require gcc-configure-common.inc
 INHIBIT_DEFAULT_DEPS = "1"
 
 do_configure () {
-        target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##`
         install -d ${D}${base_libdir} ${D}${libdir}
         mkdir -p ${B}/${BPN}
-        mkdir -p ${B}/$target/${BPN}/
+        mkdir -p ${B}/${TARGET_SYS}/${BPN}/
         cd ${B}/${BPN}
         chmod a+x ${S}/${BPN}/configure
         relpath=${@os.path.relpath("${S}/${BPN}", "${B}/${BPN}")}
@@ -18,15 +17,13 @@ EXTRACONFFUNCS += "extract_stashed_builddir"
 do_configure[depends] += "${COMPILERDEP}"
 
 do_compile () {
-        target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##`
         cd ${B}/${BPN}
-        oe_runmake MULTIBUILDTOP=${B}/$target/${BPN}/
+        oe_runmake MULTIBUILDTOP=${B}/${TARGET_SYS}/${BPN}/
 }
 
 do_install () {
-        target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##`
         cd ${B}/${BPN}
-        oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/$target/${BPN}/ install
+        oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/${TARGET_SYS}/${BPN}/ install
 
         # Move libgcc_s into /lib
         mkdir -p ${D}${base_libdir}