author | Gregory Szorc <gps@mozilla.com> |
Tue, 27 Nov 2012 14:01:17 -0800 | |
changeset 114294 | ba730945bc6db5a3aba668aebcd53dd3d3525a49 |
parent 114293 | 59281806d3a6505bcae91f58eeec9e46e5254589 |
child 114295 | 7f5e2a9addff52b23525e69ae41950d38b5b69f4 |
push id | 23913 |
push user | emorley@mozilla.com |
push date | Wed, 28 Nov 2012 17:11:31 +0000 |
treeherder | mozilla-central@17c267a881cf [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | ted |
bugs | 815219 |
milestone | 20.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/client.mk +++ b/client.mk @@ -103,16 +103,24 @@ define CR endef # As $(shell) doesn't preserve newlines, use sed to replace them with an # unlikely sequence (||), which is then replaced back to newlines by make # before evaluation. $(eval $(subst ||,$(CR),$(shell _PYMAKE=$(.PYMAKE) $(TOPSRCDIR)/$(MOZCONFIG_LOADER) $(TOPSRCDIR) 2> $(TOPSRCDIR)/.mozconfig.out | sed 's/$$/||/'))) + +# Automatically add -jN to make flags if not defined. N defaults to number of cores. +ifeq (,$(findstring -j,$(MOZ_MAKE_FLAGS))) + cores=$(shell $(PYTHON) -c 'import multiprocessing; print(multiprocessing.cpu_count())') + MOZ_MAKE_FLAGS += -j$(cores) +endif + + ifndef MOZ_OBJDIR MOZ_OBJDIR = obj-$(CONFIG_GUESS) else # On Windows Pymake builds check MOZ_OBJDIR doesn't start with "/" ifneq (,$(findstring mingw,$(CONFIG_GUESS))) ifeq (1_a,$(.PYMAKE)_$(firstword a$(subst /, ,$(MOZ_OBJDIR)))) $(error For Windows Pymake builds, MOZ_OBJDIR must be a Windows [and not MSYS] style path.) endif