From db44be06c75f2ac17a55dd1764471e869e872b8b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 30 May 2014 13:32:54 +0100 Subject: 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). Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-4.9.inc | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'meta/recipes-devtools/gcc/gcc-4.9.inc') 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 = " \ --with-sysroot=${STAGING_DIR_TARGET} \ --with-build-sysroot=${STAGING_DIR_TARGET}" -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 -} -- cgit 1.2.3-korg