summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/gcc
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-30 13:32:54 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-01 14:29:30 +0100
commitfe5bc386f6f6d5dabc40ccdb0de0f6ef8c9f6b9d (patch)
tree58c417e356861e4daa76ce2b8fe66d4bc4901f46 /meta/recipes-devtools/gcc
parent3caca17be174ce87ff8565d50c082163b2cca4ae (diff)
downloadpoky-fe5bc386f6f6d5dabc40ccdb0de0f6ef8c9f6b9d.tar.gz
gcc: Clean up configure_prepend and fix for mingw
The do_configure_prepend was duplicated in gcc-4.X.inc and gcc-configure-common.inc leading to confusion when reading the resulting do_configure task where the file was processed twice. The only difference was the removal of the include line for gcc 4.8/4.9. On mingw were were seeing two issues, firstly that the if statements meant the values we wanted weren't being set, the second that the include paths were still wrong as there was no header path set. To fix the first issue, the #ifdef conditionals were removed, we want to set these things unconditionally. The second issue is addressed by setting the NATIVE_SYSTEM_HEADER_DIR variable here (it was already set in t-oe). (From OE-Core rev: db44be06c75f2ac17a55dd1764471e869e872b8b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc')
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.8.inc17
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.9.inc17
-rw-r--r--meta/recipes-devtools/gcc/gcc-configure-common.inc8
3 files changed, 1 insertions, 41 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.8.inc b/meta/recipes-devtools/gcc/gcc-4.8.inc
index aa822cfe03..9f2928b78a 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.8.inc
@@ -119,21 +119,4 @@ EXTRA_OECONF_PATHS = " \
119 --with-sysroot=${STAGING_DIR_TARGET} \ 119 --with-sysroot=${STAGING_DIR_TARGET} \
120 --with-build-sysroot=${STAGING_DIR_TARGET}" 120 --with-build-sysroot=${STAGING_DIR_TARGET}"
121 121
122do_configure_prepend () {
123 # teach gcc to find correct target includedir when checking libc ssp support
124 mkdir -p ${B}/gcc
125 echo "NATIVE_SYSTEM_HEADER_DIR = ${SYSTEMHEADERS}" > ${B}/gcc/t-oe
126 cat ${S}/gcc/defaults.h | grep -v "\#endif.*GCC_DEFAULTS_H" > ${B}/gcc/defaults.h.new
127 cat >>${B}/gcc/defaults.h.new <<_EOF
128#ifndef STANDARD_STARTFILE_PREFIX_1
129#define STANDARD_STARTFILE_PREFIX_1 "${SYSTEMLIBS}"
130#endif
131#ifndef STANDARD_STARTFILE_PREFIX_2
132#define STANDARD_STARTFILE_PREFIX_2 "${SYSTEMLIBS1}"
133#endif
134#define SYSTEMLIBS_DIR "${SYSTEMLIBS}"
135#endif /* ! GCC_DEFAULTS_H */
136_EOF
137 mv ${B}/gcc/defaults.h.new ${B}/gcc/defaults.h
138}
139 122
diff --git a/meta/recipes-devtools/gcc/gcc-4.9.inc b/meta/recipes-devtools/gcc/gcc-4.9.inc
index 9b4fc2c9ee..185dbba822 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.9.inc
@@ -115,21 +115,4 @@ EXTRA_OECONF_PATHS = " \
115 --with-sysroot=${STAGING_DIR_TARGET} \ 115 --with-sysroot=${STAGING_DIR_TARGET} \
116 --with-build-sysroot=${STAGING_DIR_TARGET}" 116 --with-build-sysroot=${STAGING_DIR_TARGET}"
117 117
118do_configure_prepend () {
119 # teach gcc to find correct target includedir when checking libc ssp support
120 mkdir -p ${B}/gcc
121 echo "NATIVE_SYSTEM_HEADER_DIR = ${SYSTEMHEADERS}" > ${B}/gcc/t-oe
122 cat ${S}/gcc/defaults.h | grep -v "\#endif.*GCC_DEFAULTS_H" > ${B}/gcc/defaults.h.new
123 cat >>${B}/gcc/defaults.h.new <<_EOF
124#ifndef STANDARD_STARTFILE_PREFIX_1
125#define STANDARD_STARTFILE_PREFIX_1 "${SYSTEMLIBS}"
126#endif
127#ifndef STANDARD_STARTFILE_PREFIX_2
128#define STANDARD_STARTFILE_PREFIX_2 "${SYSTEMLIBS1}"
129#endif
130#define SYSTEMLIBS_DIR "${SYSTEMLIBS}"
131#endif /* ! GCC_DEFAULTS_H */
132_EOF
133 mv ${B}/gcc/defaults.h.new ${B}/gcc/defaults.h
134}
135 118
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc
index 31e3cc4551..4a105540fa 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
@@ -78,15 +78,9 @@ do_configure_prepend () {
78 echo "NATIVE_SYSTEM_HEADER_DIR = ${SYSTEMHEADERS}" > ${B}/gcc/t-oe 78 echo "NATIVE_SYSTEM_HEADER_DIR = ${SYSTEMHEADERS}" > ${B}/gcc/t-oe
79 cat ${S}/gcc/defaults.h | grep -v "\#endif.*GCC_DEFAULTS_H" > ${B}/gcc/defaults.h.new 79 cat ${S}/gcc/defaults.h | grep -v "\#endif.*GCC_DEFAULTS_H" > ${B}/gcc/defaults.h.new
80 cat >>${B}/gcc/defaults.h.new <<_EOF 80 cat >>${B}/gcc/defaults.h.new <<_EOF
81#ifndef STANDARD_INCLUDE_DIR 81#define NATIVE_SYSTEM_HEADER_DIR "${SYSTEMHEADERS}"
82#define STANDARD_INCLUDE_DIR "${SYSTEMHEADERS}"
83#endif
84#ifndef STANDARD_STARTFILE_PREFIX_1
85#define STANDARD_STARTFILE_PREFIX_1 "${SYSTEMLIBS}" 82#define STANDARD_STARTFILE_PREFIX_1 "${SYSTEMLIBS}"
86#endif
87#ifndef STANDARD_STARTFILE_PREFIX_2
88#define STANDARD_STARTFILE_PREFIX_2 "${SYSTEMLIBS1}" 83#define STANDARD_STARTFILE_PREFIX_2 "${SYSTEMLIBS1}"
89#endif
90#define SYSTEMLIBS_DIR "${SYSTEMLIBS}" 84#define SYSTEMLIBS_DIR "${SYSTEMLIBS}"
91#endif /* ! GCC_DEFAULTS_H */ 85#endif /* ! GCC_DEFAULTS_H */
92_EOF 86_EOF