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/kernel/linux.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/build/kernel') diff --git a/scripts/build/kernel/linux.sh b/scripts/build/kernel/linux.sh index 09a928df..064631b8 100644 --- a/scripts/build/kernel/linux.sh +++ b/scripts/build/kernel/linux.sh @@ -93,7 +93,7 @@ do_kernel_headers() { CT_DoLog EXTRA "Installing kernel headers" CT_DoExecLog ALL \ - ${make} -C "${kernel_path}" \ + make -C "${kernel_path}" \ CROSS_COMPILE="${CT_TARGET}-" \ O="${CT_BUILD_DIR}/build-kernel-headers" \ ARCH=${kernel_arch} \ @@ -104,7 +104,7 @@ do_kernel_headers() { if [ "${CT_KERNEL_LINUX_INSTALL_CHECK}" = "y" ]; then CT_DoLog EXTRA "Checking installed headers" CT_DoExecLog ALL \ - ${make} -C "${kernel_path}" \ + make -C "${kernel_path}" \ CROSS_COMPILE="${CT_TARGET}-" \ O="${CT_BUILD_DIR}/build-kernel-headers" \ ARCH=${kernel_arch} \ -- cgit v1.2.3