author | Mike Hommey <mh+mozilla@glandium.org> |
Thu, 05 Sep 2013 09:01:44 +0900 | |
changeset 145604 | 88f62538d582fd57e6e478b0575c96389d5de7f6 |
parent 145603 | 2c0ffcf95bcbf1350e3f3e7f5f45d6dac0843f82 |
child 145605 | 34ca46861c2839621576b4f24231458504303c77 |
push id | 25216 |
push user | emorley@mozilla.com |
push date | Thu, 05 Sep 2013 10:06:42 +0000 |
treeherder | mozilla-central@676322e0166c [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
bugs | 903118 |
milestone | 26.0a1 |
backs out | 6fe5a446b7756e5b91d63a31607a1b55174520e0 |
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
|
client.mk | file | annotate | diff | comparison | revisions | |
config/makefiles/mozconfig.mk | file | annotate | diff | comparison | revisions | |
config/rules.mk | file | annotate | diff | comparison | revisions | |
js/src/config/makefiles/mozconfig.mk | file | annotate | diff | comparison | revisions | |
js/src/config/rules.mk | file | annotate | diff | comparison | revisions |
--- a/client.mk +++ b/client.mk @@ -99,19 +99,28 @@ convert it to Unix-style line endings, r "python mozilla/build/win32/mozilla-dos2unix.py") endif endif #################################### # Load mozconfig Options # See build pages, http://www.mozilla.org/build/ for how to set up mozconfig. -# mozconfig.mk needs to be loaded multiple times by configure, so we don't check -# for INCLUDED_MOZCONFIG_MK -include $(TOPSRCDIR)/config/makefiles/mozconfig.mk + +MOZCONFIG_LOADER := build/autoconf/mozconfig2client-mk + +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/$$/||/'))) ifdef AUTOCLOBBER export AUTOCLOBBER=1 endif # 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())')
deleted file mode 100644 --- a/config/makefiles/mozconfig.mk +++ /dev/null @@ -1,33 +0,0 @@ -# -*- makefile -*- -# vim:set ts=8 sw=8 sts=8 noet: -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this file, -# You can obtain one at http://mozilla.org/MPL/2.0/. -# - -INCLUDED_MOZCONFIG_MK = 1 - -# We are pulling in the mozconfig exports, so we only need to run once for the -# whole make process tree (not for each sub-make). Export this so the sub-makes -# don't read mozconfig multiple times. -export INCLUDED_MOZCONFIG_MK - -MOZCONFIG_LOADER := build/autoconf/mozconfig2client-mk - -define CR - - -endef - -# topsrcdir is used by rules.mk (set from the generated Makefile), while -# TOPSRCDIR is used by client.mk -ifneq (,$(topsrcdir)) -top := $(topsrcdir) -else -top := $(TOPSRCDIR) -endif -# 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) $(top)/$(MOZCONFIG_LOADER) $(top) 2> $(top)/.mozconfig.out | sed 's/$$/||/')))
--- a/config/rules.mk +++ b/config/rules.mk @@ -5,20 +5,16 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. # ifndef topsrcdir $(error topsrcdir was not set)) endif -ifndef INCLUDED_MOZCONFIG_MK -include $(topsrcdir)/config/makefiles/mozconfig.mk -endif - # Integrate with mozbuild-generated make files. We first verify that no # variables provided by the automatically generated .mk files are # present. If they are, this is a violation of the separation of # responsibility between Makefile.in and mozbuild files. _MOZBUILD_EXTERNAL_VARIABLES := \ CPP_UNIT_TESTS \ DIRS \ EXTRA_PP_COMPONENTS \
deleted file mode 100644 --- a/js/src/config/makefiles/mozconfig.mk +++ /dev/null @@ -1,33 +0,0 @@ -# -*- makefile -*- -# vim:set ts=8 sw=8 sts=8 noet: -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this file, -# You can obtain one at http://mozilla.org/MPL/2.0/. -# - -INCLUDED_MOZCONFIG_MK = 1 - -# We are pulling in the mozconfig exports, so we only need to run once for the -# whole make process tree (not for each sub-make). Export this so the sub-makes -# don't read mozconfig multiple times. -export INCLUDED_MOZCONFIG_MK - -MOZCONFIG_LOADER := build/autoconf/mozconfig2client-mk - -define CR - - -endef - -# topsrcdir is used by rules.mk (set from the generated Makefile), while -# TOPSRCDIR is used by client.mk -ifneq (,$(topsrcdir)) -top := $(topsrcdir) -else -top := $(TOPSRCDIR) -endif -# 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) $(top)/$(MOZCONFIG_LOADER) $(top) 2> $(top)/.mozconfig.out | sed 's/$$/||/')))
--- a/js/src/config/rules.mk +++ b/js/src/config/rules.mk @@ -5,20 +5,16 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. # ifndef topsrcdir $(error topsrcdir was not set)) endif -ifndef INCLUDED_MOZCONFIG_MK -include $(topsrcdir)/config/makefiles/mozconfig.mk -endif - # Integrate with mozbuild-generated make files. We first verify that no # variables provided by the automatically generated .mk files are # present. If they are, this is a violation of the separation of # responsibility between Makefile.in and mozbuild files. _MOZBUILD_EXTERNAL_VARIABLES := \ CPP_UNIT_TESTS \ DIRS \ EXTRA_PP_COMPONENTS \