1 files changed, 4 insertions, 3 deletions

diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc
index d56f82ac8d..00856ad8bc 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-runtime.inc
@@ -32,9 +32,8 @@ RUNTIMETARGET = "libssp libstdc++-v3 libgomp libatomic ${RUNTIMELIBITM} \
 
 do_configure () {
         export CXX="${CXX} -nostdinc++ -nostdlib++"
-        mtarget=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##`
-        target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##`
-        hardlinkdir ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$mtarget ${B}
+        target=${TARGET_SYS}
+
         for d in libgcc ${RUNTIMETARGET}; do
                 echo "Configuring $d"
                 rm -rf ${B}/$target/$d/
@@ -45,6 +44,8 @@ do_configure () {
                 $relpath/configure ${CONFIGUREOPTS} ${EXTRA_OECONF}
         done
 }
+EXTRACONFFUNCS += "extract_stashed_builddir"
+do_configure[depends] += "${COMPILERDEP}"
 
 do_compile () {
         target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##`