summaryrefslogtreecommitdiffstats
path: root/support/dependencies
diff options
context:
space:
mode:
authorPeter Korsgaard <peter@korsgaard.com>2018-11-19 17:25:15 +0100
committerPeter Korsgaard <peter@korsgaard.com>2018-11-20 08:17:43 +0100
commit446a6f91b236ad48f01caa357f530699f443460f (patch)
tree044c2cdffc5371e8d13787ec9a50b33245c471c2 /support/dependencies
parent143241e0a5ffb09c6a17c63241d66e1a155bb166 (diff)
downloadbuildroot-446a6f91b236ad48f01caa357f530699f443460f.tar.gz
buildroot-446a6f91b236ad48f01caa357f530699f443460f.zip
make: configure host-make with host- prefix
Fixes: http://autobuild.buildroot.net/results/e29/e293aadc692d2ed337881ef2172ddf66a60bc05c/ And many more. Install as 'host-make' rather than just 'make', as that otherwise confuses a number of packages when they invoke recursive / sub-make. The internal job control logic of GNU make is version dependant, so mixing versions may lead to issues like: make[1]: Entering directory `/home/peko/autobuild/instance-0/output/build/boa-0.94.14rc21' (cd src && make -w --jobserver-fds=5,6 -j) make: unrecognized option '--jobserver-fds=5,6' With this rename, only packages explicitly opting in for our host-make (using the BR2_MAKE / BR2_MAKE_HOST_DEPENDENCY logic) will use it. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'support/dependencies')
-rw-r--r--support/dependencies/check-host-make.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/support/dependencies/check-host-make.mk b/support/dependencies/check-host-make.mk
index 4235a393fd..66560ee85c 100644
--- a/support/dependencies/check-host-make.mk
+++ b/support/dependencies/check-host-make.mk
@@ -12,8 +12,8 @@ BR2_MAKE ?= $(call suitable-host-package,make,\
$(BR2_MAKE_VERSION_MIN) $(MAKE))
ifeq ($(BR2_MAKE),)
-BR2_MAKE = $(HOST_DIR)/bin/make -j$(PARALLEL_JOBS)
-BR2_MAKE1 = $(HOST_DIR)/bin/make -j1
+BR2_MAKE = $(HOST_DIR)/bin/host-make -j$(PARALLEL_JOBS)
+BR2_MAKE1 = $(HOST_DIR)/bin/host-make -j1
BR2_MAKE_HOST_DEPENDENCY = host-make
else
BR2_MAKE = $(MAKE)
OpenPOWER on IntegriCloud