[oe-commits] Khem Raj : gcc-configure-common.inc: Muck with NATIVE_SYSTEM_HEADER_DIR

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: c0f653bc90814acf4053ec037c7ab3ad022342ff
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=c0f653bc90814acf4053ec037c7ab3ad022342ff

Author: Khem Raj <raj.khem at gmail.com>
Date:   Fri Sep 11 14:42:54 2009 -0700

gcc-configure-common.inc: Muck with NATIVE_SYSTEM_HEADER_DIR

* GCC's notion of standard includes being in /usr/include is
  not valid for micro distro which uses flattened layout

Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Henning Heinold <heinold at inf.fu-berlin.de>

---

 recipes/gcc/gcc-configure-common.inc |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/recipes/gcc/gcc-configure-common.inc b/recipes/gcc/gcc-configure-common.inc
index 7315a20..fb792a8 100644
--- a/recipes/gcc/gcc-configure-common.inc
+++ b/recipes/gcc/gcc-configure-common.inc
@@ -80,7 +80,16 @@ do_configure () {
 	sed -i 's/^LDFLAGS = $/LDFLAGS = @LDFLAGS@/' ${S}/Makefile.tpl
 
 	(cd ${S} && gnu-configize) || die "failure running gnu-configize"
-
+	# splice our idea of where the headers live into gcc's world
+	echo "NATIVE_SYSTEM_HEADER_DIR = ${layout_includedir}" > ${T}/t-oe
+	sed 's%^tmake_file=.*$%& ${T}/t-oe%' < ${S}/gcc/Makefile.in >${S}/gcc/Makefile.in.new
+	mv ${S}/gcc/Makefile.in.new ${S}/gcc/Makefile.in
+	cat ${S}/gcc/defaults.h | grep -v "\#endif.*GCC_DEFAULTS_H" > ${S}/gcc/defaults.h.new
+	echo "#ifndef STANDARD_INCLUDE_DIR" >> ${S}/gcc/defaults.h.new
+	echo "#define STANDARD_INCLUDE_DIR \"${layout_includedir}\"" >> ${S}/gcc/defaults.h.new
+	echo "#endif" >> ${S}/gcc/defaults.h.new
+	echo "#endif /* ! GCC_DEFAULTS_H */" >> ${S}/gcc/defaults.h.new
+	mv ${S}/gcc/defaults.h.new ${S}/gcc/defaults.h
 	oe_runconf
 
 	# make sure that no @LDFLAG@ is left in the generated Makefile