3 files changed, 9 insertions, 0 deletions
diff --git a/src/bootstrap/stage-0-busybox.TARGETS b/src/bootstrap/stage-0-busybox.TARGETS
index 3d0c315..a6964e1 100644
--- a/src/bootstrap/stage-0-busybox.TARGETS
+++ b/src/bootstrap/stage-0-busybox.TARGETS
@@ -57,6 +57,9 @@
     , "${MAKE} HOSTCC=${CC} HOSTCXX=${CXX} CONFIG_EXTRA_LDLIBS=\"m resolv\" defconfig >configure.log 2>&1 || (cat configure.log && exit 1)"
     , "${MAKE} -j${NJOBS} HOSTCC=${CC} HOSTCXX=${CXX} CONFIG_EXTRA_LDLIBS=\"m resolv\" >build.log 2>&1 || (cat configure.log build.log && exit 1)"
     , "${MAKE} -j${NJOBS} HOSTCC=${CC} HOSTCXX=${CXX} CONFIG_EXTRA_LDLIBS=\"m resolv\" CONFIG_PREFIX=${DESTDIR} install >>build.log 2>&1 || (cat configure.log build.log && exit 1)"
+    , "cd ${DESTDIR}"
+    , "for d in sbin usr/bin usr/sbin; do cp -l bin/busybox $d; done"
+    , "for l in $(find sbin usr/bin usr/sbin -type l); do ln -sf busybox $l; done"
     ]
   , "out_dirs": ["."]
   }
diff --git a/src/bootstrap/stage-0-gcc.TARGETS b/src/bootstrap/stage-0-gcc.TARGETS
index 8a86620..777b947 100644
--- a/src/bootstrap/stage-0-gcc.TARGETS
+++ b/src/bootstrap/stage-0-gcc.TARGETS
@@ -138,6 +138,9 @@
     , "cd ${DESTDIR}"
     , "for f in $(find . -type f | grep '\\.o$'); do strip -g $f; done"
     , "for f in $(find . -type f | grep '\\.a$'); do strip -g $f; done"
+    , "GCC_LIBDIR=\"lib/gcc/$(./bin/gcc -dumpmachine)/$(./bin/gcc -dumpfullversion -dumpversion)\""
+    , "mv ${GCC_LIBDIR}/include-fixed ${TMPDIR}/"
+    , "cp -rL ${TMPDIR}/include-fixed ${GCC_LIBDIR}/.   # resolve symlinks"
     , "cd ${DESTDIR}/bin"
     , "mv gcc gcc.real"
     , "mv g++ g++.real"
diff --git a/src/bootstrap/stage-1-gcc.TARGETS b/src/bootstrap/stage-1-gcc.TARGETS
index 42282ca..c8b3a32 100644
--- a/src/bootstrap/stage-1-gcc.TARGETS
+++ b/src/bootstrap/stage-1-gcc.TARGETS
@@ -142,6 +142,9 @@
     , "find . -type f -name '*.so*' -exec sh -c \"strip {} 2>/dev/null\" \\;"
     , "find . -type f -name '*.a' -exec sh -c \"strip -g {}\" \\;"
     , "find . -type f -name '*.o' -exec sh -c \"strip -g {}\" \\;"
+    , "GCC_LIBDIR=\"lib/gcc/$(./bin/gcc -dumpmachine)/$(./bin/gcc -dumpfullversion -dumpversion)\""
+    , "mv ${GCC_LIBDIR}/include-fixed ${TMPDIR}/"
+    , "cp -rL ${TMPDIR}/include-fixed ${GCC_LIBDIR}/.   # resolve symlinks"
     , "if [ -n \"${LINK_ARGS}\" ]; then"
     , "  cd ${DESTDIR}/bin"
     , "  mv gcc gcc.real"