gcc/libc: Change bootstrap to use an intermediate sysroot and hence no longer overwrite files

Based upon patches from Dexuan Cui <dexuan.cui@intel.com>

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

1 files changed, 3 insertions, 3 deletions

diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
index 12fdb70ae8..01571a3202 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
@@ -14,13 +14,13 @@ EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \
                 --enable-languages=c \
                 ${OPTSPACE} \
                 --program-prefix=${TARGET_PREFIX} \
-                --with-sysroot=${STAGING_DIR_TARGET} \
-                --with-build-sysroot=${STAGING_DIR_TARGET} \
+                --with-sysroot=${STAGING_DIR_TCBOOTSTRAP} \
+                --with-build-sysroot=${STAGING_DIR_TCBOOTSTRAP} \
                 ${EXTRA_OECONF_INTERMEDIATE} \
                 ${@get_gcc_fpu_setting(bb, d)}"
 
 do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_HOST} ${SYSROOT_DESTDIR}/${STAGING_DIR_TARGET}/${target_base_libdir}"
-do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_HOST} ${STAGING_DIR_TARGET}/${target_base_libdir}"
+do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_HOST} ${STAGING_DIR_TCBOOTSTRAP}/${target_base_libdir}"
 
 do_compile () {
     oe_runmake