[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - RepositoryModule_host.mk

Michael Stahl mstahl at redhat.com
Fri Aug 29 03:44:37 PDT 2014


 RepositoryModule_host.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 539f5b5f7dfc1168c4a6b826bfb18362c80fb424
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Aug 26 13:17:44 2014 +0200

    gbuild: serialize linking on "make check" too
    
    Change-Id: Icdcca50627d2a7aed19287807f8f1bc17cb18efb
    (cherry picked from commit e2bc4c005a13a4e3925c01b1e0d899899494f053)
    Reviewed-on: https://gerrit.libreoffice.org/11176
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 91141f1..4f90a70 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -181,7 +181,7 @@ endef
 # otherwise cyclic dependencies ruin everything.
 # do not serialize on a partial build as that may fail due to missing deps.
 # the default goal is all (see Module.mk)
-ifeq (,$(filter-out all,$(MAKECMDGOALS)))
+ifeq (,$(filter-out all build check unitcheck slowcheck subsequentcheck,$(MAKECMDGOALS)))
 $(eval $(call repositorymodule_serialize,\
 	scfilt scopencl \
 	$(if $(filter SCRIPTING,$(BUILD_TYPE)),vbaobj) \


More information about the Libreoffice-commits mailing list