gcc: Handle ARCH_FLAGS_FOR_TARGET option for gcc 4.1/4.2 correctly

diff --git a/packages/gcc/gcc-4.1.2.inc b/packages/gcc/gcc-4.1.2.inc
index dc6c198965811f7868a2aca7184678b3ed77d33f..6e5671280ab410eff87a8e18c182757012ae13a0 100644 (file)
--- a/packages/gcc/gcc-4.1.2.inc
+++ b/packages/gcc/gcc-4.1.2.inc
@@ -55,6 +55,4 @@ do_compile_prepend_avr32() {
 FORTRAN = ""
 JAVA = ""
 
-ARCH_FLAGS_FOR_TARGET = "-isystem${STAGING_INCDIR}"
-
 EXTRA_OECONF += " --disable-libssp "

diff --git a/packages/gcc/gcc-4.2.1.inc b/packages/gcc/gcc-4.2.1.inc
index 346a2856eddd04a6da6b768f5978aa035e347ec9..25b593714114b452c1c80a2f599b5bbf7b947c05 100644 (file)
--- a/packages/gcc/gcc-4.2.1.inc
+++ b/packages/gcc/gcc-4.2.1.inc
@@ -91,6 +91,4 @@ FORTRAN = ""
 FORTRAN_linux-gnueabi = ",fortran"
 JAVA = ""
 
-ARCH_FLAGS_FOR_TARGET = "-isystem${STAGING_INCDIR}"
-
 EXTRA_OECONF += " --disable-libgomp --disable-libssp --disable-bootstrap "

diff --git a/packages/gcc/gcc-4.2.2.inc b/packages/gcc/gcc-4.2.2.inc
index 5266b7386e9595af4698ab82151ecf7a1e212c40..e2b4c926699300a2939a85de6414ade61b5b96cc 100644 (file)
--- a/packages/gcc/gcc-4.2.2.inc
+++ b/packages/gcc/gcc-4.2.2.inc
@@ -69,7 +69,5 @@ FORTRAN = ""
 FORTRAN_linux-gnueabi = ",fortran"
 JAVA = ""
 
-ARCH_FLAGS_FOR_TARGET = "-isystem${STAGING_INCDIR}"
-
 EXTRA_OECONF += " --disable-libssp --disable-bootstrap "
 

diff --git a/packages/gcc/gcc-cross_4.1.2.bb b/packages/gcc/gcc-cross_4.1.2.bb
index 8ede2302694eb0a8175a9feab1400f3372e559b1..a344bfcba8819b0c2c023d8c5ce9d7cf30c12e18 100644 (file)
--- a/packages/gcc/gcc-cross_4.1.2.bb
+++ b/packages/gcc/gcc-cross_4.1.2.bb
@@ -10,3 +10,5 @@ SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 EXTRA_OECONF_append_avr32= "  --disable-libmudflap "
 
 EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+
+ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}"

diff --git a/packages/gcc/gcc-cross_4.2.1.bb b/packages/gcc/gcc-cross_4.2.1.bb
index 06f5305365d1d1190b316ac545017c84a6d64811..bb3b5ff9b1bf6676af82766fa2d76a316339b97b 100644 (file)
--- a/packages/gcc/gcc-cross_4.2.1.bb
+++ b/packages/gcc/gcc-cross_4.2.1.bb
@@ -11,3 +11,5 @@ SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
                --disable-libgomp --disable-libmudflap \
                --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+
+ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}"

diff --git a/packages/gcc/gcc-cross_4.2.2.bb b/packages/gcc/gcc-cross_4.2.2.bb
index 26dd9f823294958ecfc4b81f0b224c6b5c55bba5..8a7a21f1880bde03af45043562cdd8a28ca10864 100644 (file)
--- a/packages/gcc/gcc-cross_4.2.2.bb
+++ b/packages/gcc/gcc-cross_4.2.2.bb
@@ -11,3 +11,5 @@ SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
                --disable-libgomp --disable-libmudflap \
                --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+
+ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}"

diff --git a/packages/gcc/gcc_4.1.2.bb b/packages/gcc/gcc_4.1.2.bb
index 43d55fa6014b2454e8368551da68f31613161668..c51eb23b053c540ca3280244161633d5fd6063fc 100644 (file)
--- a/packages/gcc/gcc_4.1.2.bb
+++ b/packages/gcc/gcc_4.1.2.bb
@@ -3,3 +3,5 @@ PR = "r11"
 require gcc-${PV}.inc
 require gcc-configure-target.inc
 require gcc-package-target.inc
+
+ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"

diff --git a/packages/gcc/gcc_4.2.1.bb b/packages/gcc/gcc_4.2.1.bb
index 7ec84b6012392b8c771af77355c28f6519d7b9df..6da15d22b2cae7abe597aa94d92321675f57f9be 100644 (file)
--- a/packages/gcc/gcc_4.2.1.bb
+++ b/packages/gcc/gcc_4.2.1.bb
@@ -3,3 +3,5 @@ PR = "r9"
 require gcc-${PV}.inc
 require gcc-configure-target.inc
 require gcc-package-target.inc
+
+ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"

diff --git a/packages/gcc/gcc_4.2.2.bb b/packages/gcc/gcc_4.2.2.bb
index 153c5bff88c3fab0ddb109b30cb5660e337b90a1..7238aed4d702d21ca9c1e34e52221084e0d52aa9 100644 (file)
--- a/packages/gcc/gcc_4.2.2.bb
+++ b/packages/gcc/gcc_4.2.2.bb
@@ -6,3 +6,5 @@ require gcc-package-target.inc
 
 SRC_URI_append = "file://fortran-cross-compile-hack.patch;patch=1"
 
+ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
+