From: Richard Purdie <rpurdie@linux.intel.com>
Date: Mon, 7 Jun 2010 22:08:02 +0000 (+0100)
Subject: gcc-runtime: Make sure multiple target builds work correctly
X-Git-Tag: 2011-1~5919
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=2f7b3e3f31913cdbb3b359d856b10fe52a7be26b;p=openembedded-core.git

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 6716b0deed..7b43aabf99 100644
--- 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 86f973e885..e0b622b8c1 100644
--- 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
 }