From 488b27f58bfdb3c9c523448acfa17b51325fec03 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Sun, 20 Nov 2016 23:50:17 -0800 Subject: 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 --- scripts/build/debug/100-dmalloc.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts/build/debug/100-dmalloc.sh') diff --git a/scripts/build/debug/100-dmalloc.sh b/scripts/build/debug/100-dmalloc.sh index 1cfbdc0d..ad0d78dd 100644 --- a/scripts/build/debug/100-dmalloc.sh +++ b/scripts/build/debug/100-dmalloc.sh @@ -47,11 +47,11 @@ do_debug_dmalloc_build() { "${extra_config[@]}" CT_DoLog EXTRA "Building dmalloc" - CT_DoExecLog ALL ${make} + CT_DoExecLog ALL make CT_DoLog EXTRA "Installing dmalloc" - CT_DoExecLog ALL ${make} DESTDIR="${CT_SYSROOT_DIR}" installincs installlib - CT_DoExecLog ALL ${make} DESTDIR="${CT_DEBUGROOT_DIR}" installutil + CT_DoExecLog ALL make DESTDIR="${CT_SYSROOT_DIR}" installincs installlib + CT_DoExecLog ALL make DESTDIR="${CT_DEBUGROOT_DIR}" installutil CT_EndStep } -- cgit v1.2.3