Permalink
Browse files

Bug 913967: port Bug 912856 to comm-central to fix bustage, r=Standar…

…d8, a=bustage-fix.

--HG--
extra : rebase_source : c8fc0d642df7ee7891ee498c78e3f6c79d2de503
  • Loading branch information...
jcranmer committed Sep 6, 2013
1 parent 9a8bf63 commit 7cdcffdf20074be6a83c82bcd798025bd46950f3
Showing with 32 additions and 19 deletions.
  1. +1 −1 bridge/bridge.mozbuild
  2. +17 −2 config/recurse.mk
  3. +2 −16 config/rules.mk
  4. +7 −0 ldap/Makefile.in
  5. +5 −0 ldap/moz.build
View
@@ -9,7 +9,7 @@ mailnews_static_dirs = []
mailnews_dirs += ['../mozilla/xpfe/components/autocomplete']
if CONFIG['MOZ_LDAP_XPCOM']:
- mailnews_static_dirs += ['../ldap/sdks/c-sdk']
+ mailnews_dirs += ['../ldap']
mailnews_dirs += ['../ldap/xpcom']
if CONFIG['MOZ_MORK']:
View
@@ -10,6 +10,19 @@ endif
# Tier traversal handling
#########################
+ifdef TIERS
+
+compile libs export tools::
+ $(call BUILDSTATUS,TIER_START $@ $(filter-out $(if $(filter export,$@),,precompile),$(TIERS)))
+ $(foreach tier,$(TIERS), $(if $(filter-out compile_precompile libs_precompile tools_precompile,$@_$(tier)), \
+ $(call BUILDSTATUS,SUBTIER_START $@ $(tier) $(if $(filter libs,$@),$(tier_$(tier)_staticdirs)) $(tier_$(tier)_dirs)) \
+ $(if $(filter libs,$@),$(foreach dir, $(tier_$(tier)_staticdirs), $(call TIER_DIR_SUBMAKE,$@,$(tier),$(dir),,1))) \
+ $(foreach dir, $(tier_$(tier)_dirs), $(call TIER_DIR_SUBMAKE,$@,$(tier),$(dir),$@)) \
+ $(call BUILDSTATUS,SUBTIER_FINISH $@ $(tier))))
+ $(call BUILDSTATUS,TIER_FINISH $@)
+
+else
+
define CREATE_SUBTIER_TRAVERSAL_RULE
PARALLEL_DIRS_$(1) = $$(addsuffix _$(1),$$(PARALLEL_DIRS))
@@ -28,10 +41,12 @@ endif
endef
-$(foreach subtier,export libs tools,$(eval $(call CREATE_SUBTIER_TRAVERSAL_RULE,$(subtier))))
+$(foreach subtier,export compile libs tools,$(eval $(call CREATE_SUBTIER_TRAVERSAL_RULE,$(subtier))))
-export:: $(SUBMAKEFILES)
+compile export:: $(SUBMAKEFILES)
$(LOOP_OVER_TOOL_DIRS)
tools:: $(SUBMAKEFILES)
$(foreach dir,$(TOOL_DIRS),$(call SUBMAKE,libs,$(dir)))
+
+endif
View
@@ -634,16 +634,9 @@ SUBMAKEFILES += $(addsuffix /Makefile, $(DIRS) $(TOOL_DIRS) $(PARALLEL_DIRS))
# of something else. Makefiles which use this var *must* provide a sensible
# default rule before including rules.mk
ifndef SUPPRESS_DEFAULT_RULES
-ifdef TIERS
-default all alldep::
- $(foreach tier,$(TIERS),$(call SUBMAKE,tier_$(tier)))
-else
-
default all::
-ifneq (,$(strip $(STATIC_DIRS)))
- $(foreach dir,$(STATIC_DIRS),$(call SUBMAKE,,$(dir)))
-endif
$(MAKE) export
+ $(MAKE) compile
$(MAKE) libs
$(MAKE) tools
@@ -654,7 +647,6 @@ alldep::
$(MAKE) libs
$(MAKE) tools
-endif # TIERS
endif # SUPPRESS_DEFAULT_RULES
ifeq ($(filter s,$(MAKEFLAGS)),)
@@ -730,12 +722,7 @@ GLOBAL_DEPS += Makefile.in
endif
##############################################
-ifdef PARALLEL_DIRS
-libs:: $(PARALLEL_DIRS_libs)
-
-$(PARALLEL_DIRS_libs): %_libs: %/Makefile
- +@$(call SUBMAKE,libs,$*)
-endif
+compile:: $(MAKE_DIRS) $(OBJS) $(HOST_OBJS)
ifdef EXPORT_LIBRARY
ifeq ($(EXPORT_LIBRARY),1)
@@ -799,7 +786,6 @@ ifdef HOST_LIBRARY
$(call install_cmd,$(IFLAGS1) $(HOST_LIBRARY) $(DIST)/host/lib)
endif
endif # !NO_DIST_INSTALL
- $(LOOP_OVER_DIRS)
##############################################
View
@@ -0,0 +1,7 @@
+# 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/.
+
+libs export clean distclean::
+ $(MAKE) -C $(DEPTH)/ldap/sdks/c-sdk $@
+
View
@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# 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/.
+

0 comments on commit 7cdcffd

Please sign in to comment.