From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 15 Jun 2016 16:54:02 +0000 (+0200)
Subject: tools/cmake: fix parallel build with Make 4.2+
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=96db10752483cb07f822686482b44be6c21fbb5f;p=openwrt%2Fstaging%2Flynxis%2Fomap.git

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 da62f70745..aaa3b33f4f 100644
--- a/tools/cmake/Makefile
+++ b/tools/cmake/Makefile
@@ -19,10 +19,11 @@ HOST_CONFIGURE_PARALLEL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
 
+HOST_CONFIGURE_CMD := MAKEFLAGS="$(HOST_JOBS)" $(BASH) ./configure
+
 HOST_CONFIGURE_VARS :=
 
 HOST_CONFIGURE_ARGS := \
-	--prefix=$(STAGING_DIR_HOST) \
-	$(if $(MAKE_JOBSERVER),--parallel="$(MAKE_JOBSERVER)")
+	--prefix=$(STAGING_DIR_HOST)
 
 $(eval $(call HostBuild))