Port Bug 1278415 - Ensure MOZ_CURRENT_PROJECT is set when running make directly in objdir for c-c. rs=bustage-fix
authoraleth <aleth@instantbird.org>
Fri, 17 Jun 2016 21:52:38 +0200
changeset 25275 3706aefd2bdc7748a40822de36fff19d82cfb4cb
parent 25274 209456d7f0f099985a19208fe39055fb8a1abed2
child 25276 335de4c7191ea21f4752c7da50d0a168f59838e1
push id1725
push userclokep@gmail.com
push dateMon, 19 Sep 2016 17:35:08 +0000
treeherdercomm-beta@6ead1abf3817 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
bugs1278415
Port Bug 1278415 - Ensure MOZ_CURRENT_PROJECT is set when running make directly in objdir for c-c. rs=bustage-fix
client.mk
--- a/client.mk
+++ b/client.mk
@@ -180,16 +180,19 @@ else
 WANT_MOZCONFIG_MK = 1
 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))
 	$(if $(MOZCONFIG_MK_LINES),( $(foreach line,$(MOZCONFIG_MK_LINES), echo "$(subst ||, ,$(line))";) )) > $@
+ifdef MOZ_CURRENT_PROJECT
+	echo export MOZ_CURRENT_PROJECT=$(MOZ_CURRENT_PROJECT) >> $@
+endif
 
 # 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
 endif
 
 # UPLOAD_EXTRA_FILES is appended to and exported from mozconfig, which makes