зеркало из https://github.com/mozilla/gecko-dev.git
Bug 416529: Don't include .deps/.all.pp when not needed. r=benjamin, a=pavlov This to prevent unnecessarily generating the file due to the FORCE prereq.
This commit is contained in:
Родитель
fd7bd8c8f2
Коммит
6a640d9c5f
|
@ -1991,6 +1991,7 @@ endif # COMPILER_DEPEND
|
||||||
$(MDDEPDIR):
|
$(MDDEPDIR):
|
||||||
@if test ! -d $@; then echo Creating $@; rm -rf $@; mkdir $@; else true; fi
|
@if test ! -d $@; then echo Creating $@; rm -rf $@; mkdir $@; else true; fi
|
||||||
|
|
||||||
|
ifneq (,$(filter-out all chrome default export realchrome tools clean clobber clobber_all distclean realclean,$(MAKECMDGOALS)))
|
||||||
ifneq (,$(OBJS)$(XPIDLSRCS)$(SDK_XPIDLSRCS)$(SIMPLE_PROGRAMS))
|
ifneq (,$(OBJS)$(XPIDLSRCS)$(SDK_XPIDLSRCS)$(SIMPLE_PROGRAMS))
|
||||||
MDDEPEND_FILES := $(strip $(wildcard $(MDDEPDIR)/*.pp))
|
MDDEPEND_FILES := $(strip $(wildcard $(MDDEPDIR)/*.pp))
|
||||||
|
|
||||||
|
@ -2002,14 +2003,17 @@ ifdef PERL
|
||||||
# The script has an advantage over including the *.pp files directly
|
# The script has an advantage over including the *.pp files directly
|
||||||
# because it handles the case when header files are removed from the build.
|
# because it handles the case when header files are removed from the build.
|
||||||
# 'make' would complain that there is no way to build missing headers.
|
# 'make' would complain that there is no way to build missing headers.
|
||||||
|
ifeq (,$(MAKE_RESTARTS))
|
||||||
$(MDDEPDIR)/.all.pp: FORCE
|
$(MDDEPDIR)/.all.pp: FORCE
|
||||||
@$(PERL) $(BUILD_TOOLS)/mddepend.pl $@ $(MDDEPEND_FILES)
|
@$(PERL) $(BUILD_TOOLS)/mddepend.pl $@ $(MDDEPEND_FILES)
|
||||||
|
endif
|
||||||
-include $(MDDEPDIR)/.all.pp
|
-include $(MDDEPDIR)/.all.pp
|
||||||
else
|
else
|
||||||
include $(MDDEPEND_FILES)
|
include $(MDDEPEND_FILES)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
#############################################################################
|
#############################################################################
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче