diff options
| author |   Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2012-01-16 22:36:42 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2012-01-16 22:36:42 (GMT) |
| commit | b86899a341a756088e065edbf9c63c6187ff3fb6 (patch) | |
| tree | ea1711c1eed7dd7149565ffbbb8a0a51b829b39c /scripts/crosstool-NG.sh.in | |
| parent | b03575409e7dd7911cdd4bebb8637826e34ddc12 (diff) | |
scripts: fix tools override
The tools found by the new autostuff configure can contain arguments,
for example: grep -E
This needs separating the paths set for the Makfile from the paths
set for the scripts.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Diffstat (limited to 'scripts/crosstool-NG.sh.in')
| -rw-r--r-- | scripts/crosstool-NG.sh.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in index 057559f..2c52047 100644 --- a/scripts/crosstool-NG.sh.in +++ b/scripts/crosstool-NG.sh.in @@ -78,11 +78,13 @@ CT_TestOrAbort "The CONFIG_SHELL '${CT_CONFIG_SHELL}' is not valid" -f "${CT_CON CT_TOOLS_OVERIDE_DIR="${CT_WORK_DIR}/tools" CT_DoLog DEBUG "Creating bin-override for tools in '${CT_TOOLS_OVERIDE_DIR}'" CT_DoExecLog DEBUG mkdir -p "${CT_TOOLS_OVERIDE_DIR}/bin" -cat "${CT_LIB_DIR}/paths.mk" |while read trash line; do +cat "${CT_LIB_DIR}/paths.sh" |while read trash line; do tool="${line%%=*}" path="${line#*=}" CT_DoLog DEBUG "Creating script-override for '${tool}' -> '${path}'" - printf "#${BANG}${CT_CONFIG_SHELL}\nexec '${path}' \"\${@}\"\n" >"${CT_TOOLS_OVERIDE_DIR}/bin/${tool}" + # Note: we need to supress the " in the path because + # there can be arguments in there (thanks autostuff...) + printf "#${BANG}${CT_CONFIG_SHELL}\nexec ${path//\"/} \"\${@}\"\n" >"${CT_TOOLS_OVERIDE_DIR}/bin/${tool}" CT_DoExecLog ALL chmod 700 "${CT_TOOLS_OVERIDE_DIR}/bin/${tool}" done export PATH="${CT_TOOLS_OVERIDE_DIR}/bin:${PATH}" |