1.1 --- a/scripts/crosstool-NG.sh.in	Tue Jun 23 22:56:39 2009 +0200
     1.2 +++ b/scripts/crosstool-NG.sh.in	Fri Jun 26 19:09:22 2009 +0200
     1.3 @@ -349,7 +349,7 @@
     1.4      # Now we have mangled our BUILD and HOST tuples, we must fake the new
     1.5      # cross-tools for those mangled tuples.
     1.6      CT_DoLog DEBUG "Making build system tools available"
     1.7 -    CT_DoExecLog ALL mkdir -p "${CT_PREFIX_DIR}/bin"
     1.8 +    CT_DoExecLog ALL mkdir -p "${CT_PREFIX_DIR}/buildtools"
     1.9      for m in BUILD HOST; do
    1.10          r="CT_REAL_${m}"
    1.11          v="CT_${m}"
    1.12 @@ -386,8 +386,8 @@
    1.13              # bally needed
    1.14              if [ -n "${where}" ]; then
    1.15                  CT_DoLog DEBUG "  '${!v}-${tool}' -> '${where}'"
    1.16 -                printf "#${BANG}${CT_SHELL}\nexec '${where}' \"\${@}\"\n" >"${CT_PREFIX_DIR}/bin/${!v}-${tool}"
    1.17 -                CT_DoExecLog ALL chmod 700 "${CT_PREFIX_DIR}/bin/${!v}-${tool}"
    1.18 +                printf "#${BANG}${CT_SHELL}\nexec '${where}' \"\${@}\"\n" >"${CT_PREFIX_DIR}/buildtools/${!v}-${tool}"
    1.19 +                CT_DoExecLog ALL chmod 700 "${CT_PREFIX_DIR}/buildtools/${!v}-${tool}"
    1.20              else
    1.21                  case "${tool}" in
    1.22                      # We'll at least need some of them...
    1.23 @@ -417,7 +417,7 @@
    1.24      # Of course, neither cross-native nor canadian can run on BUILD,
    1.25      # so don't add those PATHs in this case...
    1.26      case "${CT_TOOLCHAIN_TYPE}" in
    1.27 -        cross)  export PATH="${CT_PREFIX_DIR}/bin:${CT_CC_CORE_SHARED_PREFIX_DIR}/bin:${CT_CC_CORE_STATIC_PREFIX_DIR}/bin:${PATH}";;
    1.28 +        cross)  export PATH="${CT_PREFIX_DIR}/buildtools:${CT_PREFIX_DIR}/bin:${CT_CC_CORE_SHARED_PREFIX_DIR}/bin:${CT_CC_CORE_STATIC_PREFIX_DIR}/bin:${PATH}";;
    1.29          *)  ;;
    1.30      esac
    1.31  
    1.32 @@ -425,8 +425,8 @@
    1.33      # Go ahead with those, by creating a wrapper that keeps partial files, and that
    1.34      # never fails:
    1.35      CT_DoLog DEBUG "  'makeinfo' -> '$(CT_Which makeinfo)'"
    1.36 -    printf "#${BANG}${CT_SHELL}\n$(CT_Which makeinfo) --force \"\${@}\"\ntrue\n" >"${CT_PREFIX_DIR}/bin/makeinfo"
    1.37 -    CT_DoExecLog ALL chmod 700 "${CT_PREFIX_DIR}/bin/makeinfo"
    1.38 +    printf "#${BANG}${CT_SHELL}\n$(CT_Which makeinfo) --force \"\${@}\"\ntrue\n" >"${CT_PREFIX_DIR}/buildtools/makeinfo"
    1.39 +    CT_DoExecLog ALL chmod 700 "${CT_PREFIX_DIR}/buildtools/makeinfo"
    1.40  
    1.41      # Help gcc
    1.42      CT_CFLAGS_FOR_HOST=
    1.43 @@ -446,6 +446,7 @@
    1.44      export PARALLELMFLAGS
    1.45  
    1.46      CT_DoLog EXTRA "Installing user-supplied crosstool-NG configuration"
    1.47 +    CT_DoExecLog ALL mkdir -p "${CT_PREFIX_DIR}/bin"
    1.48      CT_DoExecLog DEBUG install -m 0755 "${CT_LIB_DIR}/scripts/toolchain-config.in" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-ct-ng.config"
    1.49      CT_DoExecLog DEBUG sed -r -i -e 's,@@grep@@,"'"${grep}"'",;' "${CT_PREFIX_DIR}/bin/${CT_TARGET}-ct-ng.config"
    1.50      bzip2 -c -9 .config >>"${CT_PREFIX_DIR}/bin/${CT_TARGET}-ct-ng.config"