gcc-runtime: Make sure multiple target builds work correctly

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 6716b0deed412f702778a017140be840e11290be..7b43aabf997d653d3b8c72cfd0f04e4770011bcf 100644 (file)
--- a/meta/packages/gcc/gcc-configure-runtime.inc
+++ b/meta/packages/gcc/gcc-configure-runtime.inc
@@ -13,7 +13,7 @@ RUNTIMETARGET = "libgcc libssp libstdc++-v3"
 # libgfortran
 
 do_configure () {
-       cp ${STAGING_DIR_NATIVE}${prefix_native}/include/gcc-build-internal/* ${S}/gcc
+       cp ${STAGING_DIR_NATIVE}${prefix_native}/include/gcc-build-internal-${TARGET_SYS}/* ${S}/gcc
        for d in ${RUNTIMETARGET}; do
                echo "Configuring $d"
                mkdir -p ${B}/$d/

diff --git a/meta/packages/gcc/gcc-package-cross.inc b/meta/packages/gcc/gcc-package-cross.inc
index 86f973e88535369f7f321c766bb6d869e39c957a..e0b622b8c1acc6f7077f3eea4ef243d9e9b6f68d 100644 (file)
--- a/meta/packages/gcc/gcc-package-cross.inc
+++ b/meta/packages/gcc/gcc-package-cross.inc
@@ -20,14 +20,14 @@ do_install () {
        if [ "${PN}" == "gcc-cross" -o "${PN}" == "gcc-crosssdk" ]; then
                install -d ${D}${includedir}/gcc-build-internal
                for f in *.h *.c libgcc.mvars; do
-                       cp ${B}/gcc/$f ${D}${includedir}/gcc-build-internal/
+                       cp ${B}/gcc/$f ${D}${includedir}/gcc-build-internal-${TARGET_SYS}/
                done
                # Special for PowerPC (and possibly others)
                if [ -f ${B}/gcc/tramp.S ]; then
-                       cp ${B}/gcc/*.S ${D}${includedir}/gcc-build-internal/
+                       cp ${B}/gcc/*.S ${D}${includedir}/gcc-build-internal-${TARGET_SYS}/
                fi
                if [ -f libgcc.mvars]; then
-                       cp ${B}/gcc/libgcc.mvars ${D}${includedir}/gcc-build-internal/
+                       cp ${B}/gcc/libgcc.mvars ${D}${includedir}/gcc-build-internal-${TARGET_SYS}/
                fi
        fi
 }