Back out part of bab97315c5f4 / Bug 926900 due to bustage,a=Standard8
authorMark Banner <bugzilla@standard8.plus.com>
Wed, 13 Nov 2013 08:35:54 +0000
changeset 16588 da43980580e0c5a15d7035eaaeb91236965c6ba1
parent 16587 bab97315c5f448b5e82819eaa003369a6d9d6dea
child 16589 872f79854c4c959f9cd9328379c20a2c6b05c55f
child 16591 b4db464bfff144b28658512849ec05a34402922c
push idunknown
push userunknown
push dateunknown
reviewersStandard8
bugs926900
Back out part of bab97315c5f4 / Bug 926900 due to bustage,a=Standard8
client.mk
--- a/client.mk
+++ b/client.mk
@@ -106,17 +106,17 @@ define CR
 
 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 $(TOPSRCDIR)/$(MOZCONFIG_LOADER) $(TOPSRCDIR) | sed 's/$$/||/')))
+MOZCONFIG_CONTENT := $(subst ||,$(CR),$(subst || ,$(CR),$(shell _PYMAKE=$(.PYMAKE) $(TOPSRCDIR)/$(MOZCONFIG_LOADER) $(TOPSRCDIR) | sed 's/$$/||/')))
 $(eval $(MOZCONFIG_CONTENT))
 
 # 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.