[oe-commits] Khem Raj : gcc-4.7: Define own do_configure_prepend

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 149a9911a00c79475d00382dcc384f355fbcdd02
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=149a9911a00c79475d00382dcc384f355fbcdd02

Author: Khem Raj <raj.khem at gmail.com>
Date:   Tue Apr 10 00:32:23 2012 -0700

gcc-4.7: Define own do_configure_prepend

gcc-4.7 does not define STANDARD_INCLUDE_DIR

Signed-off-by: Khem Raj <raj.khem at gmail.com>

---

 meta/recipes-devtools/gcc/gcc-4.7.inc |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-devtools/gcc/gcc-4.7.inc b/meta/recipes-devtools/gcc/gcc-4.7.inc
index e61de01..5b58d8c 100644
--- a/meta/recipes-devtools/gcc/gcc-4.7.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.7.inc
@@ -100,3 +100,21 @@ EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap \
 
 EXTRA_OECONF_append_libc-uclibc = " --disable-decimal-float "
 
+do_configure_prepend () {
+        # teach gcc to find correct target includedir when checking libc ssp support
+        mkdir -p ${B}/gcc
+        echo "NATIVE_SYSTEM_HEADER_DIR = ${SYSTEMHEADERS}" > ${B}/gcc/t-oe
+        cat ${S}/gcc/defaults.h | grep -v "\#endif.*GCC_DEFAULTS_H" > ${B}/gcc/defaults.h.new
+        cat >>${B}/gcc/defaults.h.new <<_EOF
+#ifndef STANDARD_STARTFILE_PREFIX_1
+#define STANDARD_STARTFILE_PREFIX_1 "${SYSTEMLIBS}"
+#endif
+#ifndef STANDARD_STARTFILE_PREFIX_2
+#define STANDARD_STARTFILE_PREFIX_2 "${SYSTEMLIBS1}"
+#endif
+#define SYSTEMLIBS_DIR "${SYSTEMLIBS}"
+#endif /* ! GCC_DEFAULTS_H */
+_EOF
+        mv ${B}/gcc/defaults.h.new ${B}/gcc/defaults.h
+}
+