From d64bbd6bf8d41604e3f14f911f2169f4295e4d99 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Fri, 19 Aug 2011 18:29:07 -0500 Subject: detect gmake 3.81 and limit to -j1 unless num-cpu is explicitly set --- oovbaapi/prj/makefile.mk | 2 +- oovbaapi/ttt.diff | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'oovbaapi') diff --git a/oovbaapi/prj/makefile.mk b/oovbaapi/prj/makefile.mk index c677d2b3ec3f..b7863992eb89 100644 --- a/oovbaapi/prj/makefile.mk +++ b/oovbaapi/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) diff --git a/oovbaapi/ttt.diff b/oovbaapi/ttt.diff index 2400d2cf9421..4af8d1f176ff 100644 --- a/oovbaapi/ttt.diff +++ b/oovbaapi/ttt.diff @@ -407,4 +407,4 @@ new file mode 100644 +.ENDIF + +all: -+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) ++ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) -- cgit v1.2.3