diff options
author | Alexey Neyman <stilor@att.net> | 2016-11-21 07:50:17 (GMT) |
---|---|---|
committer | Alexey Neyman <stilor@att.net> | 2016-11-21 07:50:17 (GMT) |
commit | 488b27f58bfdb3c9c523448acfa17b51325fec03 (patch) | |
tree | 24f799a43b479bc65a61d317d76c6127fc2fa320 /scripts/build/companion_tools/050-make.sh | |
parent | 6cb9e62f6cc680935ad1b759018e214582b54550 (diff) |
Partially revert 6f8e89cb5ca061e899bf3feaaf3fecf30d366c3e.
The referenced commit replaced 'make' with '${make}' everywhere. This is
wrong for at least the utilities that we may build as companion tools
(make, libtool): this will always invoke the version detected by configure
by supplying the absolute path. In other words, the wrappers in
.build/tools/bin are not fallbacks - they are either temporary (in case
a respective companion tool is built) or permanent redirectors.
This is the reason why the PATH= has .build/*/buildtools/bin at higher
precedence than .build/tools/bin; the latter has the versions detected by
configure and the former has the versions built as companion tools.
Revert the rest of the gang (grep/sed/...) for consistency. After all,
we may decide to supply some of them as well (awk, for instance).
Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'scripts/build/companion_tools/050-make.sh')
-rw-r--r-- | scripts/build/companion_tools/050-make.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/build/companion_tools/050-make.sh b/scripts/build/companion_tools/050-make.sh index 8918753..4247545 100644 --- a/scripts/build/companion_tools/050-make.sh +++ b/scripts/build/companion_tools/050-make.sh @@ -20,8 +20,8 @@ do_companion_tools_make_build() { CT_DoExecLog CFG "${CT_SRC_DIR}/make-${CT_MAKE_VERSION}/configure" \ --prefix="${CT_BUILDTOOLS_PREFIX_DIR}" - CT_DoExecLog ALL ${make} - CT_DoExecLog ALL ${make} install + CT_DoExecLog ALL make + CT_DoExecLog ALL make install if [ "${CT_COMP_TOOLS_make_gmake}" = "y" ]; then CT_DoExecLog ALL ln -sv make "${CT_BUILDTOOLS_PREFIX_DIR}/bin/gmake" fi |