summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.8.inc17
-rw-r--r--meta/recipes-devtools/gcc/gcc-configure-common.inc8
2 files changed, 1 insertions, 24 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.8.inc b/meta/recipes-devtools/gcc/gcc-4.8.inc
index c32060034e..f7d7bec6b0 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.8.inc
@@ -121,21 +121,4 @@ EXTRA_OECONF_PATHS = " \
121 --with-sysroot=${STAGING_DIR_TARGET} \ 121 --with-sysroot=${STAGING_DIR_TARGET} \
122 --with-build-sysroot=${STAGING_DIR_TARGET}" 122 --with-build-sysroot=${STAGING_DIR_TARGET}"
123 123
124do_configure_prepend () {
125 # teach gcc to find correct target includedir when checking libc ssp support
126 mkdir -p ${B}/gcc
127 echo "NATIVE_SYSTEM_HEADER_DIR = ${SYSTEMHEADERS}" > ${B}/gcc/t-oe
128 cat ${S}/gcc/defaults.h | grep -v "\#endif.*GCC_DEFAULTS_H" > ${B}/gcc/defaults.h.new
129 cat >>${B}/gcc/defaults.h.new <<_EOF
130#ifndef STANDARD_STARTFILE_PREFIX_1
131#define STANDARD_STARTFILE_PREFIX_1 "${SYSTEMLIBS}"
132#endif
133#ifndef STANDARD_STARTFILE_PREFIX_2
134#define STANDARD_STARTFILE_PREFIX_2 "${SYSTEMLIBS1}"
135#endif
136#define SYSTEMLIBS_DIR "${SYSTEMLIBS}"
137#endif /* ! GCC_DEFAULTS_H */
138_EOF
139 mv ${B}/gcc/defaults.h.new ${B}/gcc/defaults.h
140}
141 124
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc
index dc44cc9f08..9533738199 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
@@ -83,15 +83,9 @@ do_configure_prepend () {
83 echo "NATIVE_SYSTEM_HEADER_DIR = ${SYSTEMHEADERS}" > ${B}/gcc/t-oe 83 echo "NATIVE_SYSTEM_HEADER_DIR = ${SYSTEMHEADERS}" > ${B}/gcc/t-oe
84 cat ${S}/gcc/defaults.h | grep -v "\#endif.*GCC_DEFAULTS_H" > ${B}/gcc/defaults.h.new 84 cat ${S}/gcc/defaults.h | grep -v "\#endif.*GCC_DEFAULTS_H" > ${B}/gcc/defaults.h.new
85 cat >>${B}/gcc/defaults.h.new <<_EOF 85 cat >>${B}/gcc/defaults.h.new <<_EOF
86#ifndef STANDARD_INCLUDE_DIR 86#define NATIVE_SYSTEM_HEADER_DIR "${SYSTEMHEADERS}"
87#define STANDARD_INCLUDE_DIR "${SYSTEMHEADERS}"
88#endif
89#ifndef STANDARD_STARTFILE_PREFIX_1
90#define STANDARD_STARTFILE_PREFIX_1 "${SYSTEMLIBS}" 87#define STANDARD_STARTFILE_PREFIX_1 "${SYSTEMLIBS}"
91#endif
92#ifndef STANDARD_STARTFILE_PREFIX_2
93#define STANDARD_STARTFILE_PREFIX_2 "${SYSTEMLIBS1}" 88#define STANDARD_STARTFILE_PREFIX_2 "${SYSTEMLIBS1}"
94#endif
95#define SYSTEMLIBS_DIR "${SYSTEMLIBS}" 89#define SYSTEMLIBS_DIR "${SYSTEMLIBS}"
96#endif /* ! GCC_DEFAULTS_H */ 90#endif /* ! GCC_DEFAULTS_H */
97_EOF 91_EOF