OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only start parallel make if user hasn't already

Browse Source 
The -j flag should only be submitted once. If we are enclosed by yet
another layer of makes, then it will have setup everything for this
sub-make to take part in the job pool.
This commit is contained in:
Roland Kaufmann 2013-02-07 11:48:54 +01:00
parent 4bf313d421
commit 9020ef64e3
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
GNUmakefile
View File

@ -28,7 +28,11 @@ export CCACHE_DISABLE:=1
# the leading plus makes us run this regardless of options, see # the leading plus makes us run this regardless of options, see
# http://www.gnu.org/software/make/manual/make.html#Instead-of-Execution # http://www.gnu.org/software/make/manual/make.html#Instead-of-Execution
__everything: __everything:
+@$(IONICE) $(NICE) $(MAKE) --no-print-directory -f Makefile -j $(PROCS) $(MAKECMDGOALS) # only put on a parallel flag if there isn't already one; otherwise we
# get the warning "-jN forced in submake: disabling jobserver mode".
# this have to happen inside the rule, because -j option is removed from
# MAKEFLAGS outside
+@$(IONICE) $(NICE) $(MAKE) --no-print-directory -f Makefile $(if $(findstring -j,$(MAKEFLAGS)),,-j $(PROCS)) $(MAKECMDGOALS)
# automatically generate all the goals we are asked to make and delegate # automatically generate all the goals we are asked to make and delegate
# processing of them to the real makefile through the dependency (since # processing of them to the real makefile through the dependency (since