Bug 1082323 - Reject pymake in client.mk. r=mshal
☠☠ backed out by 26273b92b2d7 ☠ ☠
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 15 Oct 2014 14:49:09 +0900
changeset 236919 b30422149e3e1aade6d772d4e539dbfe2053a85b
parent 236918 f7e31a757487256d57fac3b4cc8f91a1e06de546
child 236920 26273b92b2d7b9a5850bfca2ab3790264bbac05e
push id660
push userraliiev@mozilla.com
push dateWed, 18 Feb 2015 20:30:48 +0000
treeherdermozilla-release@49e493494178 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1082323
milestone36.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 1082323 - Reject pymake in client.mk. r=mshal
client.mk
--- a/client.mk
+++ b/client.mk
@@ -86,18 +86,24 @@ ifneq (,$(findstring mingw,$(CONFIG_GUES
 
 # check for CRLF line endings
 ifneq (0,$(shell $(PERL) -e 'binmode(STDIN); while (<STDIN>) { if (/\r/) { print "1"; exit } } print "0"' < $(TOPSRCDIR)/client.mk))
 $(error This source tree appears to have Windows-style line endings. To \
 convert it to Unix-style line endings, check \
 "https://developer.mozilla.org/en-US/docs/Developer_Guide/Mozilla_build_FAQ\#Win32-specific_questions" \
 for a workaround of this issue.)
 endif
+
+# Set this for baseconfig.mk
+HOST_OS_ARCH=WINNT
 endif
 
+# Include baseconfig.mk for its $(MAKE) validation.
+include $(TOPSRCDIR)/config/baseconfig.mk
+
 ####################################
 # Load mozconfig Options
 
 # See build pages, http://www.mozilla.org/build/ for how to set up mozconfig.
 
 define CR