diff options
| author | Stewart Miles <smiles@google.com> | 2015-11-12 18:16:45 -0800 |
|---|---|---|
| committer | Stewart Miles <smiles@google.com> | 2015-11-12 18:25:24 -0800 |
| commit | 4f96603e129b5a1b5c05965f15afe478530654ac (patch) | |
| tree | f949f73a3831ce02a72a0c34bc3474e2c15257be /android | |
| parent | 9dc5d378b147a6c70799810f8db0754dd89ea12e (diff) | |
| download | flatbuffers-4f96603e129b5a1b5c05965f15afe478530654ac.tar.gz flatbuffers-4f96603e129b5a1b5c05965f15afe478530654ac.tar.bz2 flatbuffers-4f96603e129b5a1b5c05965f15afe478530654ac.zip | |
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
Diffstat (limited to 'android')
| -rw-r--r-- | android/jni/include.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/android/jni/include.mk b/android/jni/include.mk index cf6322dd..417f6670 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)) |