From 4f96603e129b5a1b5c05965f15afe478530654ac Mon Sep 17 00:00:00 2001 From: Stewart Miles Date: Thu, 12 Nov 2015 18:16:45 -0800 Subject: [PATCH] Pass job server arguments (-jX) to make. When $(MAKE) is expanded via a macro "make" doesn't know whether $(MAKE) refers to an instance of the make app and therefore doesn't pass job server arguments down. This change adds the + prefix to the command in the receipe in order to indicate $(MAKE) is another instance of make. Tested: Verified flatc builds in parallel from Android builds. Change-Id: I9f2f4f9680b818fdda7420a75a8bfa995b4644db --- android/jni/include.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/android/jni/include.mk b/android/jni/include.mk index cf6322dd7..417f66700 100644 --- a/android/jni/include.mk +++ b/android/jni/include.mk @@ -102,8 +102,11 @@ endef endif ifeq (Linux,$(PROJECT_OS)) define build_flatc_recipe - mkdir -p bin && cd bin && $(CMAKE) $(FLATBUFFERS_CMAKELISTS_DIR) \ - && $(MAKE) flatc + +mkdir -p bin && \ + cd bin && \ + $(CMAKE) \ + $(FLATBUFFERS_CMAKELISTS_DIR) && \ + $(MAKE) flatc endef endif ifeq (Darwin,$(PROJECT_OS))