From 409ea7385a17c5b29404352a4b08218b93eb37c0 Mon Sep 17 00:00:00 2001 From: Ian Neal Date: Tue, 19 Aug 2014 17:48:00 +0100 Subject: [PATCH] Bug 1054727 - Port |Bug 1042432 - Change how UPLOAD_EXTRA_FILES is passed down from mozconfig.cache to the build system| and |Bug 991976 - Only fail creating .mozconfig.mk once| to comm-central r=jcranmer for a CLOSED TREE bustage fix --- build/mozconfig.cache | 2 +- client.mk | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/build/mozconfig.cache b/build/mozconfig.cache index 207bfed578..c003f5f6ea 100644 --- a/build/mozconfig.cache +++ b/build/mozconfig.cache @@ -60,7 +60,7 @@ else ac_add_options "--with-compiler-wrapper=python2.7 $topsrcdir/sccache/sccache.py" mk_add_options MOZ_PREFLIGHT_ALL+=build/sccache.mk mk_add_options MOZ_POSTFLIGHT_ALL+=build/sccache.mk - UPLOAD_EXTRA_FILES="$UPLOAD_EXTRA_FILES sccache.log.gz" + mk_add_options "export UPLOAD_EXTRA_FILES+=sccache.log.gz" case "$platform" in win*) # sccache supports a special flag to create depfiles. diff --git a/client.mk b/client.mk index 8e72865ba9..5ed28e76b2 100644 --- a/client.mk +++ b/client.mk @@ -196,9 +196,15 @@ $(OBJDIR)/.mozconfig.mk: $(FOUND_MOZCONFIG) $(call mkdir_deps,$(OBJDIR)) # Include that makefile so that it is created. This should not actually change # the environment since MOZCONFIG_CONTENT, which MOZCONFIG_OUT_LINES derives # from, has already been eval'ed. --include $(OBJDIR)/.mozconfig.mk +include $(OBJDIR)/.mozconfig.mk endif +# UPLOAD_EXTRA_FILES is appended to and exported from mozconfig, which makes +# submakes as well as configure add even more to that, so just unexport it +# for submakes to pick it from .mozconfig.mk and for configure to pick it +# from mach environment. +unexport UPLOAD_EXTRA_FILES + # These targets are candidates for auto-running client.py ifeq (01,$(MAKELEVEL)$(if $(ALWAYS_RUN_CLIENT_PY),1,))