1.1 --- a/scripts/crosstool-NG.sh.in	Mon Jan 16 23:36:42 2012 +0100
     1.2 +++ b/scripts/crosstool-NG.sh.in	Sun Jan 01 17:49:44 2012 +0100
     1.3 @@ -162,11 +162,6 @@
     1.4  # Compute test suite install directory
     1.5  CT_TEST_SUITE_DIR=${CT_INSTALL_DIR}/test-suite
     1.6  
     1.7 -# Note: we'll always install the core compiler in its own directory, so as to
     1.8 -# not mix the two builds: core and final.
     1.9 -CT_CC_CORE_STATIC_PREFIX_DIR="${CT_BUILD_DIR}/${CT_CC}-core-static"
    1.10 -CT_CC_CORE_SHARED_PREFIX_DIR="${CT_BUILD_DIR}/${CT_CC}-core-shared"
    1.11 -
    1.12  # We must ensure that we can restart if asked for!
    1.13  if [ -n "${CT_RESTART}" -a ! -d "${CT_STATE_DIR}"  ]; then
    1.14      CT_DoLog ERROR "You asked to restart a non-restartable build"
    1.15 @@ -239,10 +234,6 @@
    1.16  CT_DoExecLog ALL mkdir -p "${CT_INSTALL_DIR}"
    1.17  CT_DoExecLog ALL mkdir -p "${CT_PREFIX_DIR}"
    1.18  CT_DoExecLog ALL mkdir -p "${CT_COMPLIBS_DIR}"
    1.19 -if [ -z "${CT_CANADIAN}" ]; then
    1.20 -    CT_DoExecLog ALL mkdir -p "${CT_CC_CORE_STATIC_PREFIX_DIR}"
    1.21 -    CT_DoExecLog ALL mkdir -p "${CT_CC_CORE_SHARED_PREFIX_DIR}"
    1.22 -fi
    1.23  
    1.24  # Only create the state dir if asked for a restartable build
    1.25  [ -n "${CT_DEBUG_CT_SAVE_STEPS}" ] && CT_DoExecLog ALL mkdir -p "${CT_STATE_DIR}"
    1.26 @@ -457,13 +448,12 @@
    1.27  
    1.28      # Carefully add paths in the order we want them:
    1.29      #  - first try in ${CT_PREFIX_DIR}/bin
    1.30 -    #  - then try in ${CT_CC_CORE_SHARED_PREFIX_DIR}/bin
    1.31 -    #  - then try in ${CT_CC_CORE_STATIC_PREFIX_DIR}/bin
    1.32 +    #  - then try the buildtools dir
    1.33      #  - fall back to searching user's PATH
    1.34      # Of course, neither cross-native nor canadian can run on BUILD,
    1.35      # so don't add those PATHs in this case...
    1.36      case "${CT_TOOLCHAIN_TYPE}" in
    1.37 -        cross)  export PATH="${CT_BUILDTOOLS_PREFIX_DIR}/bin:${CT_PREFIX_DIR}/bin:${CT_CC_CORE_SHARED_PREFIX_DIR}/bin:${CT_CC_CORE_STATIC_PREFIX_DIR}/bin:${PATH}";;
    1.38 +        cross)  export PATH="${CT_PREFIX_DIR}/bin:${CT_BUILDTOOLS_PREFIX_DIR}/bin:${PATH}";;
    1.39          canadian) export PATH="${CT_BUILDTOOLS_PREFIX_DIR}/bin:${PATH}";;
    1.40          *)  ;;
    1.41      esac