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 /config_host.mk.in | |
| 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 'config_host.mk.in')
| -rw-r--r-- | config_host.mk.in | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 31f40b1abaa7..cb38d43a8d29 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -39,7 +39,6 @@ export BSH_JAR=@BSH_JAR@ export BSH_TARBALL=@BSH_TARBALL@ export BUILD_DMAKE=@BUILD_DMAKE@ export BUILD_MOZAB=@BUILD_MOZAB@ -export BUILD_NCPUS=@BUILD_NCPUS@ export BUILD_PLATFORM=@build@ export BUILD_POSTGRESQL_SDBC=@BUILD_POSTGRESQL_SDBC@ export BUILD_TYPE=@BUILD_TYPE@ @@ -206,8 +205,7 @@ export GIT_NEEDED_SUBMODULES=@GIT_NEEDED_SUBMODULES@ export GIT_REPO_NAMES=@GIT_REPO_NAMES@ export GLIB_CFLAGS=@GLIB_CFLAGS@ export GLIB_LIBS=@GLIB_LIBS@ -export GMAKE_MODULE_PARALLELISM=@GMAKE_MODULE_PARALLELISM@ -export GMAKE_PARALLELISM=@GMAKE_PARALLELISM@ +export PARALLELISM=@PARALLELISM@ export GNOMEVFS_CFLAGS=@GNOMEVFS_CFLAGS@ export GNOMEVFS_LIBS=@GNOMEVFS_LIBS@ @x_GNUCP@ export GNUCOPY=@GNUCP@ |