From b93bbfdd39bb349443cc96be30ee92233b1fd940 Mon Sep 17 00:00:00 2001 From: Josh Berdine Date: Wed, 23 Dec 2015 08:26:49 -0800 Subject: [PATCH] Fix recursive make invocations building models Summary: public When building models, make was invoked explicitly with `make -j` rather than with `$(MAKE)`. This prevented controlling parallelism from the top-level make invocation. Reviewed By: akotulski Differential Revision: D2786812 fb-gh-sync-id: 7f6d58c --- infer/models/c/Makefile.in | 2 +- infer/models/cpp/Makefile.in | 2 +- infer/models/objc/Makefile.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/infer/models/c/Makefile.in b/infer/models/c/Makefile.in index 0758f176a..2feed5628 100644 --- a/infer/models/c/Makefile.in +++ b/infer/models/c/Makefile.in @@ -19,7 +19,7 @@ all: $(C_MODELS_FILE) $(C_MODELS_FILE): $(C_MODELS_SOURCES) $(CLANG_DEPS) # make clean in src/ in case $(CLANG_DEPS) have changed $(MAKE) -C src clean - $(INFER) -o out/ --models_mode --no_failures_allowed -- make -C src -j + $(INFER) -o out/ --models_mode --no_failures_allowed -- $(MAKE) -C src touch $(C_MODELS_FILE) install: $(C_MODELS_FILE) diff --git a/infer/models/cpp/Makefile.in b/infer/models/cpp/Makefile.in index 35f8a363c..9f931a7ad 100644 --- a/infer/models/cpp/Makefile.in +++ b/infer/models/cpp/Makefile.in @@ -19,7 +19,7 @@ all: $(CPP_MODELS_FILE) $(CPP_MODELS_FILE): $(CPP_MODELS_SOURCES) $(CLANG_DEPS) # make clean in src/ in case $(CLANG_DEPS) have changed $(MAKE) -C src clean - $(INFER) -o out/ --models_mode --no_failures_allowed -- make -C src -j + $(INFER) -o out/ --models_mode --no_failures_allowed -- $(MAKE) -C src touch $(CPP_MODELS_FILE) install: $(CPP_MODELS_FILE) diff --git a/infer/models/objc/Makefile.in b/infer/models/objc/Makefile.in index c1b7c2ec2..4e0b781bd 100644 --- a/infer/models/objc/Makefile.in +++ b/infer/models/objc/Makefile.in @@ -19,7 +19,7 @@ all: $(OBJC_MODELS_FILE) $(OBJC_MODELS_FILE): $(OBJC_MODELS_SOURCES) $(CLANG_DEPS) # make clean in src/ in case $(CLANG_DEPS) have changed $(MAKE) -C src clean - $(INFER) -o out/ --models_mode --no_failures_allowed -- make -C src -j + $(INFER) -o out/ --models_mode --no_failures_allowed -- $(MAKE) -C src touch $(OBJC_MODELS_FILE) install: $(OBJC_MODELS_FILE)