1.1 --- a/scripts/crosstool-NG.sh.in Sun Jan 01 17:49:44 2012 +0100
1.2 +++ b/scripts/crosstool-NG.sh.in Sun Apr 01 19:07:11 2012 +0200
1.3 @@ -157,7 +157,18 @@
1.4 CT_BUILDTOOLS_PREFIX_DIR="${CT_WORK_DIR}/${CT_TARGET}/buildtools"
1.5 CT_STATE_DIR="${CT_WORK_DIR}/${CT_TARGET}/state"
1.6 CT_CONFIG_DIR="${CT_BUILD_DIR}/configs"
1.7 -CT_COMPLIBS_DIR="${CT_BUILD_DIR}/static"
1.8 +# Note about HOST_COMPLIBS_DIR: it's always gonna be in the buildtools dir, or a
1.9 +# sub-dir. So we won't have to save/restore it, not even create it.
1.10 +# In case of cross or native, host-complibs are used for build-complibs;
1.11 +# in case of canadian or cross-native, host-complibs are specific
1.12 +case "${CT_TOOLCHAIN_TYPE}" in
1.13 + native|cross)
1.14 + CT_HOST_COMPLIBS_DIR="${CT_BUILDTOOLS_PREFIX_DIR}"
1.15 + ;;
1.16 + canadian|cross-native)
1.17 + CT_HOST_COMPLIBS_DIR="${CT_BUILDTOOLS_PREFIX_DIR}/complibs-host"
1.18 + ;;
1.19 +esac
1.20
1.21 # Compute test suite install directory
1.22 CT_TEST_SUITE_DIR=${CT_INSTALL_DIR}/test-suite
1.23 @@ -233,7 +244,7 @@
1.24 CT_DoExecLog ALL mkdir -p "${CT_CONFIG_DIR}"
1.25 CT_DoExecLog ALL mkdir -p "${CT_INSTALL_DIR}"
1.26 CT_DoExecLog ALL mkdir -p "${CT_PREFIX_DIR}"
1.27 -CT_DoExecLog ALL mkdir -p "${CT_COMPLIBS_DIR}"
1.28 +CT_DoExecLog ALL mkdir -p "${CT_HOST_COMPLIBS_DIR}"
1.29
1.30 # Only create the state dir if asked for a restartable build
1.31 [ -n "${CT_DEBUG_CT_SAVE_STEPS}" ] && CT_DoExecLog ALL mkdir -p "${CT_STATE_DIR}"