[Libreoffice-commits] .: Makefile

[Matus Kukan]

 Makefile |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit a2ba4dcbd232c071bd69011a735bf9cd3001a15d
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Mon Feb 20 12:17:22 2012 +0100

    It's safer to run one job at a time in instsetoo_native on Windows

diff --git a/Makefile b/Makefile
index 8ebbe46..346e91c 100644
--- a/Makefile
+++ b/Makefile
@@ -378,8 +378,14 @@ bootstrap: $(WORKDIR_BOOTSTRAP)
 # Build
 #
 build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset)
+	cd packimages && unset MAKEFLAGS && \
+        $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM)
+ifeq ($(OS_FOR_BUILD),WNT)
+	cd instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl
+else
 	cd instsetoo_native && unset MAKEFLAGS && \
-	$(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM)
+        $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) -- -P$(GMAKE_PARALLELISM)
+endif
 
 cross-toolset: bootstrap fetch
 	cd cross_toolset && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS)