diff options
| author |   Alexey Neyman <stilor@att.net> | 2017-02-27 03:06:35 (GMT) |
|---|---|---|
| committer | Alexey Neyman <stilor@att.net> | 2017-02-27 03:06:35 (GMT) |
| commit | 59bab98b2de061f395dc81f9a31157b4b1f9de91 (patch) | |
| tree | 1f294bca496405cc83ac69967460b3f0cebb1d7c /scripts/crosstool-NG.sh.in | |
| parent | df1e3e32cfb7cf09e4636b08eeffb53181ca1e83 (diff) | |
Revert "Determine whether -E/-r option selects extended regexp"
This reverts commit 7bcf18bfab84374d3305c7a088f95ac1219ddf93.
Diffstat (limited to 'scripts/crosstool-NG.sh.in')
| -rw-r--r-- | scripts/crosstool-NG.sh.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in index 7145403..b39dee4 100644 --- a/scripts/crosstool-NG.sh.in +++ b/scripts/crosstool-NG.sh.in @@ -117,7 +117,7 @@ cat "${CT_LIB_DIR}/paths.sh" |while read trash line; do fi CT_DoLog DEBUG "Creating script-override for '${tool}' -> '${path}' using '${tmpl}' template" CT_DoExecLog ALL cp "${tmpl}" "${CT_TOOLS_OVERRIDE_DIR}/bin/${tool}" - CT_DoExecLog ALL ${sed_r} -i \ + CT_DoExecLog ALL ${sed} -i -r \ -e "s#@CONFIG_SHELL@#${CT_CONFIG_SHELL}#g" \ -e "s#@TOOL_PATH@#${path}#g" \ -e "s#@TOOLS_OVERRIDE_DIR@#${CT_TOOLS_OVERRIDE_DIR}#g" \ @@ -148,7 +148,7 @@ CT_DoLog INFO "Building environment variables" CT_TestAndAbort "'CT_PREFIX_DIR' is not set: where should I install?" -z "${CT_PREFIX_DIR}" # Avoid multiple '/' in the prefix dir, it breaks relocatability -CT_PREFIX_DIR="$( ${sed_r} -e 's:/+:/:g; s:/*$::;' <<<"${CT_PREFIX_DIR}" )" +CT_PREFIX_DIR="$( "${sed}" -r -e 's:/+:/:g; s:/*$::;' <<<"${CT_PREFIX_DIR}" )" # Second kludge: merge user-supplied target CFLAGS with architecture-provided # target CFLAGS. Do the same for LDFLAGS in case it happens in the future. |