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, 8 insertions, 11 deletions

diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc
index 00856ad8bc..745cf74f86 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-runtime.inc
@@ -32,15 +32,14 @@ RUNTIMETARGET = "libssp libstdc++-v3 libgomp libatomic ${RUNTIMELIBITM} \
 
 do_configure () {
         export CXX="${CXX} -nostdinc++ -nostdlib++"
-        target=${TARGET_SYS}
 
         for d in libgcc ${RUNTIMETARGET}; do
                 echo "Configuring $d"
-                rm -rf ${B}/$target/$d/
-                mkdir -p ${B}/$target/$d/
-                cd ${B}/$target/$d/
+                rm -rf ${B}/${TARGET_SYS}/$d/
+                mkdir -p ${B}/${TARGET_SYS}/$d/
+                cd ${B}/${TARGET_SYS}/$d/
                 chmod a+x ${S}/$d/configure
-                relpath=${@os.path.relpath("${S}/$d", "${B}/$target/$d")}
+                relpath=${@os.path.relpath("${S}/$d", "${B}/${TARGET_SYS}/$d")}
                 $relpath/configure ${CONFIGUREOPTS} ${EXTRA_OECONF}
         done
 }
@@ -48,18 +47,16 @@ EXTRACONFFUNCS += "extract_stashed_builddir"
 do_configure[depends] += "${COMPILERDEP}"
 
 do_compile () {
-        target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##`
         for d in libgcc ${RUNTIMETARGET}; do
-                cd ${B}/$target/$d/
-                oe_runmake MULTIBUILDTOP=${B}/$target/$d/
+                cd ${B}/${TARGET_SYS}/$d/
+                oe_runmake MULTIBUILDTOP=${B}/${TARGET_SYS}/$d/
         done
 }
 
 do_install () {
-        target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##`
         for d in ${RUNTIMETARGET}; do
-                cd ${B}/$target/$d/
-                oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/$target/$d/ install
+                cd ${B}/${TARGET_SYS}/$d/
+                oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/${TARGET_SYS}/$d/ install
         done
         rm -rf ${D}${infodir}/libgomp.info ${D}${infodir}/dir
         rm -rf ${D}${infodir}/libitm.info ${D}${infodir}/dir