1.1 --- a/scripts/crosstool-NG.sh.in Sun Jan 10 17:43:23 2010 +0100
1.2 +++ b/scripts/crosstool-NG.sh.in Tue Jan 12 21:21:39 2010 +0100
1.3 @@ -77,17 +77,17 @@
1.4 # Contains symlinks to the tools found by ./configure
1.5 # Note: CT_DoLog and CT_DoExecLog do not use any of those tool, so
1.6 # they can be safely used
1.7 -CT_BIN_OVERIDE_DIR="${CT_WORK_DIR}/bin"
1.8 -CT_DoLog DEBUG "Creating bin-overide for tools in '${CT_BIN_OVERIDE_DIR}'"
1.9 -CT_DoExecLog DEBUG mkdir -p "${CT_BIN_OVERIDE_DIR}"
1.10 +CT_TOOLS_OVERIDE_DIR="${CT_WORK_DIR}/tools"
1.11 +CT_DoLog DEBUG "Creating bin-overide for tools in '${CT_TOOLS_OVERIDE_DIR}'"
1.12 +CT_DoExecLog DEBUG mkdir -p "${CT_TOOLS_OVERIDE_DIR}/bin"
1.13 cat "${CT_LIB_DIR}/paths.mk" |while read trash line; do
1.14 tool="${line%%=*}"
1.15 path="${line#*=}"
1.16 CT_DoLog DEBUG "Creating script-override for '${tool}' -> '${path}'"
1.17 - printf "#${BANG}${CT_SHELL}\nexec '${path}' \"\${@}\"\n" >"${CT_BIN_OVERIDE_DIR}/${tool}"
1.18 - CT_DoExecLog ALL chmod 700 "${CT_BIN_OVERIDE_DIR}/${tool}"
1.19 + printf "#${BANG}${CT_SHELL}\nexec '${path}' \"\${@}\"\n" >"${CT_TOOLS_OVERIDE_DIR}/bin/${tool}"
1.20 + CT_DoExecLog ALL chmod 700 "${CT_TOOLS_OVERIDE_DIR}/bin/${tool}"
1.21 done
1.22 -export PATH="${CT_BIN_OVERIDE_DIR}:${PATH}"
1.23 +export PATH="${CT_TOOLS_OVERIDE_DIR}/bin:${PATH}"
1.24
1.25 # Start date. Can't be done until we know the locale
1.26 # Also requires the bin-override tools