summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2012-02-20 12:17:22 +0100
committerMatúš Kukan <matus.kukan@gmail.com>2012-02-20 12:21:52 +0100
commita2ba4dcbd232c071bd69011a735bf9cd3001a15d (patch)
tree8c75c50ee1087f0cdd66fc2913cf2f58eab1de84 /Makefile
parent5e0c6ab6254b129b664a32e5b94046085316e372 (diff)
It's safer to run one job at a time in instsetoo_native on Windows
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 7 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 8ebbe46154ca..346e91c39d17 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)