tools/cmake: fix parallel build with Make 4.2+

Avoid using the --parallel argument to the CMake bootstrap, as that doesn't
allow us to remove the -j argument. Instead, pass the HOST_JOBS arguments
in MAKEFLAGS.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>

diff --git a/tools/cmake/Makefile b/tools/cmake/Makefile
index da62f70745d2d72bf4e2f686ac8152c25acdedaf..aaa3b33f4f3912a20be6237a54a31a2aea5f1049 100644 (file)
--- a/tools/cmake/Makefile
+++ b/tools/cmake/Makefile
@@ -19,10 +19,11 @@ HOST_CONFIGURE_PARALLEL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
 
 
 include $(INCLUDE_DIR)/host-build.mk
 

+HOST_CONFIGURE_CMD := MAKEFLAGS="$(HOST_JOBS)" $(BASH) ./configure
+

 HOST_CONFIGURE_VARS :=
 
 HOST_CONFIGURE_ARGS := \
 HOST_CONFIGURE_VARS :=
 
 HOST_CONFIGURE_ARGS := \

-       --prefix=$(STAGING_DIR_HOST) \
-       $(if $(MAKE_JOBSERVER),--parallel="$(MAKE_JOBSERVER)")
+       --prefix=$(STAGING_DIR_HOST)

 
 $(eval $(call HostBuild))
 
 $(eval $(call HostBuild))