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, 7 insertions, 0 deletions

diff --git a/meta/recipes-core/eglibc/eglibc-initial.inc b/meta/recipes-core/eglibc/eglibc-initial.inc
index cb50e89226..ce85d99096 100644
--- a/meta/recipes-core/eglibc/eglibc-initial.inc
+++ b/meta/recipes-core/eglibc/eglibc-initial.inc
@@ -45,8 +45,15 @@ do_install () {
        install -m 644 csu/crt[1in].o ${D}${libdir}
        ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
                -o ${D}${libdir}/libc.so
+
+        # add links to linux-libc-headers: gcc-{cross,crossdk}-intermediate need this.
+        for t in linux asm asm-generic; do
+                ln -s ${STAGING_DIR_TARGET}${includedir}/$t ${D}${includedir}/
+        done
 }
 
 do_siteconfig () {
         :
 }
+
+do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_TCBOOTSTRAP}"