diff options
-rw-r--r-- | scripts/build/cc/gcc.sh | 9 | ||||
-rw-r--r-- | scripts/build/internals.sh | 3 | ||||
-rw-r--r-- | scripts/crosstool-NG.sh.in | 2 |
3 files changed, 1 insertions, 13 deletions
diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh index 6474c9c..d3c5d74 100644 --- a/scripts/build/cc/gcc.sh +++ b/scripts/build/cc/gcc.sh @@ -332,15 +332,6 @@ do_cc() { CT_Test "Building ${CT_CC_LANG_OTHERS//,/ } language(s) is not yet supported. Will try..." -n "${CT_CC_LANG_OTHERS}" lang_opt=$(echo "${lang_opt},${CT_CC_LANG_OTHERS}" |sed -r -e 's/,+/,/g; s/,*$//;') - # In case we build the C++ compiler, we have to tell gcc where to put the - # C++ headers, or else it will try to put it in prefix/tuple/include, - # which we make a symlink to sysroot/usr/include during the build, and - # that we delete (the symlink!) after the build, but gcc will not look - # in sysroot/usr/inlcude for C++ headers by default - if [ "${CT_CC_LANG_CXX}" = "y" ]; then - extra_config+=("--with-gxx-include-dir=${CT_SYSROOT_DIR}/usr/include") - fi - extra_config+=("--enable-languages=${lang_opt}") extra_config+=("--disable-multilib") for tmp in ARCH ABI CPU TUNE FPU FLOAT; do diff --git a/scripts/build/internals.sh b/scripts/build/internals.sh index eae1123..ca284a0 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 9ea7664..445f0f6 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 |