Bug 1074034, part 3: Use mozilla-central's baseconfig.mk instead of forking it, r=Standard8. a=jcranmer
authorJoshua Cranmer <Pidgeot18@gmail.com>
Mon, 29 Sep 2014 18:20:08 -0500
changeset 20993 d9ef713a866e688f9af378b2ce332e9b6c3a112f
parent 20992 2bc3fa56968298764f14f05b0779ebd43a14b66c
child 20994 3a8e98f52f91fa3708ba1793bbb251f813fa120f
push id1259
push usermbanner@mozilla.com
push dateFri, 28 Nov 2014 16:21:42 +0000
treeherdercomm-beta@219e12aa22c1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersStandard8, jcranmer
bugs1074034
Bug 1074034, part 3: Use mozilla-central's baseconfig.mk instead of forking it, r=Standard8. a=jcranmer A small complication arises in that we need to maintain distinct topsrcdir variables, so we can't just delete this file. But we can make it as small as possible. Note that we don't include the mozilla-central version if INCLUDED_AUTOCONF_MK is not defined, since topsrcdir (and hence MOZILLA_SRCDIR) is undefined. Pushing to a CLOSED TREE because this is important to get to developers, since it makes incremental builds work again!
config/baseconfig.mk
--- a/config/baseconfig.mk
+++ b/config/baseconfig.mk
@@ -1,42 +1,16 @@
 # 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
-DIST = $(DEPTH)/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 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
-
-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::
+else
+include $(MOZILLA_SRCDIR)/config/baseconfig.mk
 endif
 
 # WIN_TOP_SRC is converted by config.mk to mozilla-central, but this needs to be comm-central.
 ifdef WIN_TOP_SRC
 WIN_TOP_SRC := $(patsubst %/mozilla,%,$(WIN_TOP_SRC))
 endif