diff options
author | Matt A. Tobin <email@mattatobin.com> | 2020-01-25 19:49:01 -0500 |
---|---|---|
committer | Matt A. Tobin <email@mattatobin.com> | 2020-01-25 19:49:01 -0500 |
commit | 2d98a15f90fb27c0f2cf607ca985df84d344f85d (patch) | |
tree | 81682ab154de3abde0acf283745452cee2daad3b | |
parent | c653391e905b69799f083197fa847bb7e20d2d13 (diff) | |
download | basilisk-2d98a15f90fb27c0f2cf607ca985df84d344f85d.tar.gz |
Complete the clobber file detection
-rw-r--r-- | client.mk | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -334,12 +334,12 @@ CONFIG_STATUS_DEPS := \ $(wildcard $(TOPSRCDIR)/*/confvars.sh) \ $(wildcard $(TOPSRCDIR)/*/configure.in) \ $(wildcard $(TOPSRCDIR)/*/config/version.txt) \ - $(wildcard $(CONFIGURES)) \ + $(wildcard $(CONFIGURES)) \ + $(TOPSRCDIR)/platform/CLOBBER \ $(wildcard $(TOPSRCDIR)/platform/nsprpub/configure) \ $(wildcard $(TOPSRCDIR)/platform/config/milestone.txt) \ $(wildcard $(TOPSRCDIR)/platform/ldap/sdks/c-sdk/configure) \ $(wildcard $(addsuffix confvars.sh,$(wildcard $(TOPSRCDIR)/*/))) \ - $(TOPSRCDIR)/platform/CLOBBER \ $(NULL) CONFIGURE_ENV_ARGS += \ @@ -355,13 +355,14 @@ else CONFIGURE = $(TOPSRCDIR)/configure endif -$(OBJDIR)/CLOBBER: $(TOPSRCDIR)/CLOBBER +$(OBJDIR)/CLOBBER: $(TOPSRCDIR)/platform/CLOBBER $(PYTHON) $(TOPSRCDIR)/platform/config/pythonpath.py -I $(TOPSRCDIR)/platform/testing/mozbase/mozfile \ - $(TOPSRCDIR)/platform/python/mozbuild/mozbuild/controller/clobber.py $(TOPSRCDIR)/platform $(OBJDIR) + $(TOPSRCDIR)/platform/python/mozbuild/mozbuild/controller/clobber.py $(TOPSRCDIR)/platform $(OBJDIR) configure-files: $(CONFIGURES) configure-preqs = \ + $(OBJDIR)/CLOBBER \ configure-files \ $(call mkdir_deps,$(OBJDIR)) \ $(if $(MOZ_BUILD_PROJECTS),$(call mkdir_deps,$(MOZ_OBJDIR))) \ |