author | Mike Hommey <mh+mozilla@glandium.org> |
Fri, 06 Sep 2013 09:19:32 +0900 | |
changeset 145780 | 2375fae8e78f1c3563f5d5722ed1762a92a57455 |
parent 145779 | 0c3e37bb0973e094f0c8b364642f6eb43e987171 |
child 145781 | c9da7671a0a9495476fec6ce6fb7933415745cc2 |
push id | 33380 |
push user | mh@glandium.org |
push date | Fri, 06 Sep 2013 00:25:21 +0000 |
treeherder | mozilla-inbound@6cb722cd3f7c [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | gps |
bugs | 912856 |
milestone | 26.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
|
Makefile.in | file | annotate | diff | comparison | revisions | |
config/recurse.mk | file | annotate | diff | comparison | revisions | |
config/rules.mk | file | annotate | diff | comparison | revisions | |
js/src/config/recurse.mk | file | annotate | diff | comparison | revisions | |
js/src/config/rules.mk | file | annotate | diff | comparison | revisions |
--- a/Makefile.in +++ b/Makefile.in @@ -86,17 +86,17 @@ ifdef ENABLE_TESTS # Additional makefile targets to call automated test suites include $(topsrcdir)/testing/testsuite-targets.mk endif 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 distclean:: $(RM) $(DIST_GARBAGE) ifeq ($(OS_ARCH),WINNT) # we want to copy PDB files on Windows
--- a/config/recurse.mk +++ b/config/recurse.mk @@ -7,19 +7,19 @@ include $(topsrcdir)/config/rules.mk endif ######################### # Tier traversal handling ######################### 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),$@)) \ $(call BUILDSTATUS,SUBTIER_FINISH $@ $(tier)))) $(call BUILDSTATUS,TIER_FINISH $@) else @@ -36,17 +36,17 @@ endif $(1):: $$(SUBMAKEFILES) ifdef PARALLEL_DIRS +@$(MAKE) $$(PARALLEL_DIRS_$(1)) endif $$(LOOP_OVER_DIRS) 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
--- a/config/rules.mk +++ b/config/rules.mk @@ -686,16 +686,17 @@ SUBMAKEFILES += $(addsuffix /Makefile, $ # 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 + $(MAKE) compile $(MAKE) libs $(MAKE) tools endif # SUPPRESS_DEFAULT_RULES ifeq ($(findstring s,$(filter-out --%, $(MAKEFLAGS))),) ECHO := echo QUIET := else @@ -724,16 +725,18 @@ HOST_LIBS_DEPS = $(filter %.$(LIB_SUFFIX # Dependencies which, if modified, should cause everything to rebuild GLOBAL_DEPS += Makefile $(DEPTH)/config/autoconf.mk $(topsrcdir)/config/config.mk ifndef NO_MAKEFILE_RULE GLOBAL_DEPS += Makefile.in endif ############################################## +compile:: $(OBJS) $(HOST_OBJS) + include $(topsrcdir)/config/makefiles/target_libs.mk ############################################## ifndef NO_PROFILE_GUIDED_OPTIMIZE ifdef MOZ_PROFILE_USE ifeq ($(OS_ARCH)_$(GNU_CC), WINNT_) # When building with PGO, we have to make sure to re-link # in the MOZ_PROFILE_USE phase if we linked in the
--- a/js/src/config/recurse.mk +++ b/js/src/config/recurse.mk @@ -7,19 +7,19 @@ include $(topsrcdir)/config/rules.mk endif ######################### # Tier traversal handling ######################### 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),$@)) \ $(call BUILDSTATUS,SUBTIER_FINISH $@ $(tier)))) $(call BUILDSTATUS,TIER_FINISH $@) else @@ -36,17 +36,17 @@ endif $(1):: $$(SUBMAKEFILES) ifdef PARALLEL_DIRS +@$(MAKE) $$(PARALLEL_DIRS_$(1)) endif $$(LOOP_OVER_DIRS) 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
--- a/js/src/config/rules.mk +++ b/js/src/config/rules.mk @@ -686,16 +686,17 @@ SUBMAKEFILES += $(addsuffix /Makefile, $ # 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 + $(MAKE) compile $(MAKE) libs $(MAKE) tools endif # SUPPRESS_DEFAULT_RULES ifeq ($(findstring s,$(filter-out --%, $(MAKEFLAGS))),) ECHO := echo QUIET := else @@ -724,16 +725,18 @@ HOST_LIBS_DEPS = $(filter %.$(LIB_SUFFIX # Dependencies which, if modified, should cause everything to rebuild GLOBAL_DEPS += Makefile $(DEPTH)/config/autoconf.mk $(topsrcdir)/config/config.mk ifndef NO_MAKEFILE_RULE GLOBAL_DEPS += Makefile.in endif ############################################## +compile:: $(OBJS) $(HOST_OBJS) + include $(topsrcdir)/config/makefiles/target_libs.mk ############################################## ifndef NO_PROFILE_GUIDED_OPTIMIZE ifdef MOZ_PROFILE_USE ifeq ($(OS_ARCH)_$(GNU_CC), WINNT_) # When building with PGO, we have to make sure to re-link # in the MOZ_PROFILE_USE phase if we linked in the