Bug 1031009 - Follow m-c baseconfig.mk changes, r=jcranmer.
authorRichard Marti <richard.marti@gmail.com>
Fri, 27 Jun 2014 09:36:06 +0200
changeset 20405 2e3af17556ad0513080a4cb9e47d6b4a091cf70c
parent 20404 644f4464bfcd2083e5f9b3948c6cd28dedd2f7ee
child 20406 a900b3a64007c4b2944abc9948e112ec97acffe2
push idunknown
push userunknown
push dateunknown
reviewersjcranmer
bugs1031009
Bug 1031009 - Follow m-c baseconfig.mk changes, r=jcranmer.
config/baseconfig.mk
--- a/config/baseconfig.mk
+++ b/config/baseconfig.mk
@@ -1,24 +1,38 @@
+# This file is normally included by autoconf.mk, but it is also used
+# directly in python/mozbuild/mozbuild/base.py for gmake validation.
+# We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending
+# whether a normal build is happening or whether the check is running.
 includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
 MOZILLA_SRCDIR = $(topsrcdir)/mozilla
 MOZDEPTH = $(DEPTH)/mozilla
 DIST = $(MOZDEPTH)/dist
 
 # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
 # manually use it before config.mk inclusion
 _OBJ_SUFFIX := $(OBJ_SUFFIX)
 OBJ_SUFFIX = $(error config/config.mk needs to be included before using OBJ_SUFFIX)
 
 ifeq ($(HOST_OS_ARCH),WINNT)
-# We only support building with pymake or a specially built gnu make.
-ifndef .PYMAKE
+# We only support building with a non-msys gnu make version
+# strictly above 4.0.
+ifdef .PYMAKE
+$(error Pymake is no longer supported. Please upgrade to MozillaBuild 1.9 or newer and build with 'mach' or 'mozmake')
+endif
+
 ifeq (,$(filter mozmake%,$(notdir $(MAKE))))
 $(error Only building with pymake or mozmake is supported.)
 endif
-endif
+
+ifdef INCLUDED_AUTOCONF_MK
 ifeq (a,$(firstword a$(subst /, ,$(srcdir))))
 $(error MSYS-style srcdir are not supported for Windows builds.)
 endif
+endif
 endif # WINNT
+
+ifndef INCLUDED_AUTOCONF_MK
+default::
+endif