1 files changed, 13 insertions, 1 deletions

diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
index a515fb0cc6..543a94a768 100644
--- 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
 }