diff options
| author |   Alexey Neyman <stilor@att.net> | 2017-02-27 22:16:59 (GMT) |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2017-02-27 22:16:59 (GMT) |
| commit | 1ec5e7aa3400b534264ba1c2fa3949dc6a2cca90 (patch) | |
| tree | 67bf8ce9fc7b7558d39a26a0958399a3f0640baa /scripts/crosstool-NG.sh.in | |
| parent | 85ae00c1a6331d7738abb406a1eb59091c8a4535 (diff) | |
| parent | b3c23b7fdb62f396d47f46d8e3908725570d4acd (diff) | |
Merge pull request #618 from stilor/revert-sed-require-gnu-sed
Require GNU sed on macos
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..902c15d 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. |