Просмотр исходного кода

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 <[email protected]>
Matthias Schiffer 9 лет назад
Родитель
Сommit
96db107524
1 измененных файлов с 3 добавлено и 2 удалено
  1. 3 2
      tools/cmake/Makefile

+ 3 - 2
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))