gcc-cross-initial: Ensure it uses an isolated sysroot

If we don't do this, a stale limits.h may be detected in STAGING_DIR_TARGET
which would result in a different limits.h getting generated by gcc-cross-initial
that references it. The referenced limits.h will then not get found by eglibc-initial
causing rather strange build failures.

The simplest solution is to create a temporary sysroot containing only the things
gcc-cross-initial should care about and this results in a correct limits.h file
regardless of what else may have been built.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
index a515fb0cc6da4965f8174e0de0f592b820a1162d..543a94a768d0b8bbb6971f6d94f05bd157868678 100644 (file)
--- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
@@ -19,11 +19,23 @@ EXTRA_OECONF = "--with-newlib \
                 ${OPTSPACE} \
                --program-prefix=${TARGET_PREFIX} \
                --with-sysroot=${STAGING_DIR_TARGET} \
-               --with-build-sysroot=${STAGING_DIR_TARGET} \
+               --with-build-sysroot=${GCCCROSS_BUILDSYSROOT} \
                ${EXTRA_OECONF_INITIAL} \
                ${@base_contains('DISTRO_FEATURES', 'ld-is-gold', '--with-ld=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}ld.bfd', '', d)} \
                ${EXTRA_OECONF_FPU}"
 
+
+GCCCROSS_BUILDSYSROOT = "${B}/tmpsysroot"
+
+do_configure_prepend () {
+       sysr=${GCCCROSS_BUILDSYSROOT}${target_includedir}
+       mkdir -p $sysr
+       for t in linux asm asm-generic; do
+               rm -f $sysr/$t
+               ln -s ${STAGING_DIR_TARGET}${target_includedir}/$t $sysr/
+       done
+}
+
 do_compile () {
     oe_runmake all-gcc all-target-libgcc
 }