gcc-cross: Use MULTIMACH_TARGET_SYS instead of TARGET_SYS in staging path

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/packages/gcc/gcc-configure-runtime.inc b/meta/packages/gcc/gcc-configure-runtime.inc
index 9719e48ab568b5ce852b39823553b66e36493c40..96bf9e48e42c534b35f6dcfa69eb3a401059ed32 100644 (file)
--- a/meta/packages/gcc/gcc-configure-runtime.inc
+++ b/meta/packages/gcc/gcc-configure-runtime.inc
@@ -33,7 +33,7 @@ do_compile () {
 do_install () {
        # Install libgcc from our gcc-cross saved data
        install -d ${D}${base_libdir} ${D}${libdir}
-       cp -fpPR ${STAGING_INCDIR_NATIVE}/gcc-build-internal-${TARGET_SYS}/* ${D}
+       cp -fpPR ${STAGING_INCDIR_NATIVE}/gcc-build-internal-${MULTIMACH_TARGET_SYS}/* ${D}
 
        for d in ${RUNTIMETARGET}; do
                cd ${B}/$d/

diff --git a/meta/packages/gcc/gcc-package-cross.inc b/meta/packages/gcc/gcc-package-cross.inc
index 8a170d083b7f2739392eb04d771ca55929fe4da2..579daa163f2c676d3a2fe413c9c0aab688c0ffa3 100644 (file)
--- a/meta/packages/gcc/gcc-package-cross.inc
+++ b/meta/packages/gcc/gcc-package-cross.inc
@@ -18,7 +18,7 @@ do_install () {
 
        # gcc-runtime installs libgcc into a special location in staging since it breaks doing a standalone build
        if [ "${PN}" == "gcc-cross" -o "${PN}" == "gcc-crosssdk" ]; then
-               dest=${D}/${includedir}/gcc-build-internal-${TARGET_SYS}
+               dest=${D}/${includedir}/gcc-build-internal-${MULTIMACH_TARGET_SYS}
                oe_runmake "DESTDIR=$dest" libdir=${target_libdir} base_libdir=${target_base_libdir} prefix=${target_prefix} exec_prefix=${target_exec_prefix} install-target-libgcc
 
                # Ideally here we'd override the libgcc Makefile's idea of slibdir but