diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-08-19 18:29:07 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-08-19 18:29:07 -0500 |
commit | d64bbd6bf8d41604e3f14f911f2169f4295e4d99 (patch) | |
tree | d937d231126f8f7edea0734be6c2ce8f2f4e9347 /oovbaapi | |
parent | 3c880648fb99b0f7d276dd2ef1eaf99127a85c46 (diff) |
detect gmake 3.81 and limit to -j1 unless num-cpu is explicitly set
Diffstat (limited to 'oovbaapi')
-rw-r--r-- | oovbaapi/prj/makefile.mk | 2 | ||||
-rw-r--r-- | oovbaapi/ttt.diff | 2 |
2 files changed, 2 insertions, 2 deletions
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) |