diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-10-27 19:05:33 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-10-30 20:34:03 +0000 |
| commit | ed0b160041c46d74c81ba849f1f841eb5bdaba1c (patch) | |
| tree | 4ca2574fa47b0ddd1c04361bd010aec19ada289a /solenv | |
| parent | 036f86db553494c781f58cbb5cbb567774217ec4 (diff) | |
fix parallelism variables and let's have only --with-parallelism from now on
Rationale:
- it is advised to use max-jobs and num-cpus with the same value in wiki
- max-jobs was used only for lcms2 and few gbuild
modules outside of tail_build anyway.
Also fixes:
- really use CHECK_PARALLELISM when meant to
- EXTMAXPROCESS is not defined in gbuild;
use parent's jobservers in sub-make where possible
Change-Id: I501de732d223ce0c935081bd1d73da611d16ee88
Reviewed-on: https://gerrit.libreoffice.org/930
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'solenv')
| -rwxr-xr-x | solenv/bin/build.pl | 3 | ||||
| -rw-r--r-- | solenv/bin/callcatcher.Makefile | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl index b754f1665e02..c8e62ee91171 100755 --- a/solenv/bin/build.pl +++ b/solenv/bin/build.pl @@ -1901,11 +1901,10 @@ sub run_job { { return 1 if (! $path =~ /prj$/ ); mkpath("$workdir/Logs"); - my $gbuild_flags = '-j' . $ENV{GMAKE_MODULE_PARALLELISM}; + my $gbuild_flags = '-j' . $ENV{PARALLELISM}; my $gbuild_target = 'all slowcheck'; if ($registered_name =~ /tail_build\/prj$/ ) { - $gbuild_flags = '-j' . $ENV{GMAKE_PARALLELISM}; $gbuild_target = $ENV{gb_TAILBUILDTARGET}; } $gbuild_flags .= ' ' . $ENV{GMAKE_OPTIONS}; diff --git a/solenv/bin/callcatcher.Makefile b/solenv/bin/callcatcher.Makefile index b0164efebf18..e6d262a541f2 100644 --- a/solenv/bin/callcatcher.Makefile +++ b/solenv/bin/callcatcher.Makefile @@ -24,9 +24,9 @@ include $(SOLARENV)/gbuild/gbuild.mk findunusedcode: cd instsetoo_native && unset MAKEFLAGS && \ - $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) + $(SOLARENV)/bin/build.pl -P$(PARALLELISM) --all -- -P$(PARALLELISM) ooinstall -l $(DEVINSTALLDIR)/opt - $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post subsequentcheck + $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post subsequentcheck callanalyse \ $(WORKDIR)/LinkTarget/*/* \ */$(OUTPATH)/bin/* \ |