diff --git a/scripts/build/internals.sh b/scripts/build/internals.sh index eae1123f..ca284a0f 100644 --- a/scripts/build/internals.sh +++ b/scripts/build/internals.sh @@ -155,10 +155,9 @@ do_finish() { CT_DoExecLog ALL rm -f "${d}/lib64" done - # Also remove the include/ and lib/ symlinks out-side of sysroot + # Also remove the lib/ symlink out-side of sysroot if [ "${CT_USE_SYSROOT}" = "y" ]; then CT_DoExecLog ALL rm -f "${CT_PREFIX_DIR}/${CT_TARGET}/lib" - CT_DoExecLog ALL rm -f "${CT_PREFIX_DIR}/${CT_TARGET}/include" fi CT_EndStep diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in index 9ea76648..445f0f6e 100644 --- a/scripts/crosstool-NG.sh.in +++ b/scripts/crosstool-NG.sh.in @@ -324,8 +324,6 @@ if [ -z "${CT_RESTART}" ]; then if [ "${CT_USE_SYSROOT}" = "y" ]; then # Prevent gcc from installing its libraries outside of the sys-root CT_DoExecLog ALL ln -sf "./${CT_SYSROOT_DIR_PREFIX}/sys-root/lib" "${CT_PREFIX_DIR}/${CT_TARGET}/lib" - # Prevent libc from installing its headers outside of the sysroot - CT_DoExecLog ALL ln -sf "./${CT_SYSROOT_DIR_PREFIX}/sys-root/usr/include" "${CT_PREFIX_DIR}/${CT_TARGET}/include" fi # Since we're *not* multilib on the target side, we want all the