Bug 913246 - Fix configure with relative MOZCONFIG. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 06 Sep 2013 11:24:43 +0900
changeset 145793 1b29c0885eb54c8a5a73b5693aa6eef6abcf91d8
parent 145792 c76b5ba14102942f41439f3d416eb87ad83d15d3
child 145794 73dff4338b06405080f8b235ab44d97e58186a7f
push id33385
push usermh@glandium.org
push dateFri, 06 Sep 2013 02:25:23 +0000
treeherdermozilla-inbound@1b29c0885eb5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs913246
milestone26.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 913246 - Fix configure with relative MOZCONFIG. r=gps
client.mk
--- a/client.mk
+++ b/client.mk
@@ -115,16 +115,18 @@ endef
 # As $(shell) doesn't preserve newlines, use sed to replace them with an
 # unlikely sequence (||), which is then replaced back to newlines by make
 # before evaluation. $(shell) replacing newlines with spaces, || is always
 # followed by a space (since sed doesn't remove newlines), except on the
 # last line, so replace both '|| ' and '||'.
 MOZCONFIG_CONTENT := $(subst ||,$(CR),$(subst || ,$(CR),$(shell _PYMAKE=$(.PYMAKE) $(TOPSRCDIR)/$(MOZCONFIG_LOADER) $(TOPSRCDIR) | sed 's/$$/||/')))
 $(eval $(MOZCONFIG_CONTENT))
 
+export FOUND_MOZCONFIG
+
 # As '||' was used as a newline separator, it means it's not occurring in
 # lines themselves. It can thus safely be used to replaces normal spaces,
 # to then replace newlines with normal spaces. This allows to get a list
 # of mozconfig output lines.
 MOZCONFIG_OUT_LINES := $(subst $(CR), ,$(subst $(NULL) $(NULL),||,$(MOZCONFIG_CONTENT)))
 # Filter-out comments from those lines.
 START_COMMENT = \#
 MOZCONFIG_OUT_FILTERED := $(filter-out $(START_COMMENT)%,$(MOZCONFIG_OUT_LINES))