From d96a2ab84e07c1acd3f9d5fe1906c44c6ed928b5 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Thu, 5 Sep 2013 09:18:49 +0900 Subject: [PATCH] Fixup for bug 911634. r=gps --- client.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client.mk b/client.mk index 223e057261a2..cf009ba0dbf6 100644 --- a/client.mk +++ b/client.mk @@ -201,8 +201,9 @@ endif ifdef WANT_MOZCONFIG_MK # For now, only output "export" lines from mozconfig2client-mk output. +MOZCONFIG_MK_LINES := $(filter export||%,$(MOZCONFIG_OUT_LINES)) $(OBJDIR)/.mozconfig.mk: $(FOUND_MOZCONFIG) $(call mkdir_deps,$(OBJDIR)) - ( $(foreach line,$(filter export||%,$(MOZCONFIG_OUT_LINES)), echo "$(subst ||, ,$(line))";) ) > $@ + $(if $(MOZCONFIG_MK_LINES),( $(foreach line,$(MOZCONFIG_MK_LINES), echo "$(subst ||, ,$(line))";) )) > $@ # Include that makefile so that it is created. This should not actually change # the environment since MOZCONFIG_CONTENT, which MOZCONFIG_OUT_LINES derives