Bug 1077622 - Fixes cp missing operand message if no .mozconfig found r=glandium
authorArnaud Sourioux <six.dsn@gmail.com>
Mon, 02 Mar 2015 10:09:00 +0100
changeset 231800 6da4ee2f15f5d47a3271faee39d886096a8b1c29
parent 231799 db7e1eae0a005e2148f17c75ee463bd6f97afda4
child 231801 319d452a704901e24a65e653fb6e3e7d7ab3a0f6
push id56362
push usercbook@mozilla.com
push dateWed, 04 Mar 2015 12:57:16 +0000
treeherdermozilla-inbound@f124f6d08ec7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1077622
milestone39.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
Bug 1077622 - Fixes cp missing operand message if no .mozconfig found r=glandium
client.mk
--- a/client.mk
+++ b/client.mk
@@ -350,17 +350,19 @@ CREATE_MOZCONFIG_JSON = $(shell $(TOPSRC
 # case the result is non empty, and allowing an override on the make command
 # line not running the command (using := $(shell) still runs the shell command).
 ifneq (,$(CREATE_MOZCONFIG_JSON))
 endif
 
 $(OBJDIR)/.mozconfig.json: $(call mkdir_deps,$(OBJDIR)) ;
 
 save-mozconfig: $(FOUND_MOZCONFIG)
+ifdef FOUND_MOZCONFIG
 	-cp $(FOUND_MOZCONFIG) $(OBJDIR)/.mozconfig
+endif
 
 configure:: $(configure-preqs)
 	@echo cd $(OBJDIR);
 	@echo $(CONFIGURE) $(CONFIGURE_ARGS)
 	@cd $(OBJDIR) && $(BUILD_PROJECT_ARG) $(CONFIGURE_ENV_ARGS) $(CONFIGURE) $(CONFIGURE_ARGS) \
 	  || ( echo '*** Fix above errors and then restart with\
                "$(MAKE) -f client.mk build"' && exit 1 )
 	@touch $(OBJDIR)/Makefile