Bug 777378 - Remove SUPPRESS_DEFAULT_RULES. r=gps
authorSylvestre Ledru <sylvestre@debian.org>
Thu, 23 Jan 2014 09:38:29 -0500
changeset 164852 9b4dfa6818b940c5793a44046c7aad06f89d8497
parent 164851 24668220c9a47d170287851615bed4fe8fbd75bf
child 164853 fc5112c72bba376ecc93191d196abbf4f0f7343b
push id26064
push userryanvm@gmail.com
push dateThu, 23 Jan 2014 20:26:56 +0000
treeherdermozilla-central@c0df37c18e54 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs777378
milestone29.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
Bug 777378 - Remove SUPPRESS_DEFAULT_RULES. r=gps
config/makefiles/xpidl/Makefile.in
config/rules.mk
intl/icu/Makefile.in
--- a/config/makefiles/xpidl/Makefile.in
+++ b/config/makefiles/xpidl/Makefile.in
@@ -1,13 +1,12 @@
 # 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/.
 
-SUPPRESS_DEFAULT_RULES := 1
 STANDALONE_MAKEFILE := 1
 
 include $(topsrcdir)/config/rules.mk
 
 # Building XPIDLs effectively consists of two steps:
 #
 #   1) Staging all .idl files to a common directory.
 #   2) Doing everything with the .idl files.
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -587,27 +587,25 @@ export MOZBUILD_BACKEND_CHECKED=1
 endif
 endif
 endif
 
 # The root makefile doesn't want to do a plain export/libs, because
 # of the tiers and because of libxul. Suppress the default rules in favor
 # of something else. Makefiles which use this var *must* provide a sensible
 # default rule before including rules.mk
-ifndef SUPPRESS_DEFAULT_RULES
 default all::
 	$(MAKE) export
 ifdef MOZ_PSEUDO_DERECURSE
 ifdef COMPILE_ENVIRONMENT
 	$(MAKE) compile
 endif
 endif
 	$(MAKE) libs
 	$(MAKE) tools
-endif # SUPPRESS_DEFAULT_RULES
 
 ifeq ($(findstring s,$(filter-out --%, $(MAKEFLAGS))),)
 ECHO := echo
 QUIET :=
 else
 ECHO := true
 QUIET := -q
 endif
--- a/intl/icu/Makefile.in
+++ b/intl/icu/Makefile.in
@@ -1,14 +1,13 @@
 # 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/.
 
 STANDALONE_MAKEFILE = 1
-SUPPRESS_DEFAULT_RULES = 1
 
 # Ensure that this happens before including rules.mk
 ifdef ENABLE_INTL_API
   ifndef MOZ_NATIVE_ICU
   # Library names: On Windows, ICU uses modified library names for static
   # and debug libraries.
     ifeq ($(OS_ARCH),WINNT)
       ifdef MOZ_DEBUG