Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 21:01:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 912856 - Add a compile 'tier' to build OBJS and HOST_OBJS. r=gps

Browse Source
This commit is contained in:
Mike Hommey 2013-09-06 09:19:32 +09:00
parent a39e437eae
commit 265e821783
5 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.in
View File

@ -91,7 +91,7 @@ export::
$(call py_action,process_install_manifest,$(DIST)/include _build_manifests/install/dist_include js/src/_build_manifests/install/dist_include)
default all::
$(call BUILDSTATUS,TIERS export libs tools)
$(call BUILDSTATUS,TIERS export compile libs tools)
include $(topsrcdir)/config/rules.mk

8
config/recurse.mk
View File

@ -12,9 +12,9 @@ endif
ifdef TIERS
libs export tools::
compile libs export tools::
$(call BUILDSTATUS,TIER_START $@ $(filter-out $(if $(filter export,$@),,precompile),$(TIERS)))
$(foreach tier,$(TIERS), $(if $(filter-out libs_precompile tools_precompile,$@_$(tier)), \
$(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),$@)) \
@ -41,9 +41,9 @@ 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)

3
config/rules.mk
View File

@ -691,6 +691,7 @@ SUBMAKEFILES += $(addsuffix /Makefile, $(DIRS) $(TOOL_DIRS) $(PARALLEL_DIRS))
ifndef SUPPRESS_DEFAULT_RULES
default all::
$(MAKE) export
$(MAKE) compile
$(MAKE) libs
$(MAKE) tools
endif # SUPPRESS_DEFAULT_RULES
@ -729,6 +730,8 @@ GLOBAL_DEPS += Makefile.in
endif
##############################################
compile:: $(OBJS) $(HOST_OBJS)
include $(topsrcdir)/config/makefiles/target_libs.mk
##############################################

8
js/src/config/recurse.mk
View File

@ -12,9 +12,9 @@ endif
ifdef TIERS
libs export tools::
compile libs export tools::
$(call BUILDSTATUS,TIER_START $@ $(filter-out $(if $(filter export,$@),,precompile),$(TIERS)))
$(foreach tier,$(TIERS), $(if $(filter-out libs_precompile tools_precompile,$@_$(tier)), \
$(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),$@)) \
@ -41,9 +41,9 @@ 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)

3
js/src/config/rules.mk
View File

@ -691,6 +691,7 @@ SUBMAKEFILES += $(addsuffix /Makefile, $(DIRS) $(TOOL_DIRS) $(PARALLEL_DIRS))
ifndef SUPPRESS_DEFAULT_RULES
default all::
$(MAKE) export
$(MAKE) compile
$(MAKE) libs
$(MAKE) tools
endif # SUPPRESS_DEFAULT_RULES
@ -729,6 +730,8 @@ GLOBAL_DEPS += Makefile.in
endif
##############################################
compile:: $(OBJS) $(HOST_OBJS)
include $(topsrcdir)/config/makefiles/target_libs.mk
##############################################