From 7048f8597194971902c85abe5edfcfaebcd5a20b Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Fri, 22 Jan 2016 14:23:03 +0900
Subject: [PATCH] Bug 1239217 - Enable the hybrid FasterMake+RecursiveMake
 backend for artifact builds. r=gps

---
 build/autoconf/config.status.m4 | 10 ++++++++--
 configure.in                    |  6 ++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/build/autoconf/config.status.m4 b/build/autoconf/config.status.m4
index 7ca286bc674..8c21bbda247 100644
--- a/build/autoconf/config.status.m4
+++ b/build/autoconf/config.status.m4
@@ -228,12 +228,18 @@ define([AC_CONFIG_HEADER],
 
 define([MOZ_BUILD_BACKEND],
 [
-BUILD_BACKENDS="RecursiveMake"
+dnl For now, only enable the unified hybrid build system on artifact builds,
+dnl otherwise default to RecursiveMake /and/ FasterMake.
+if [ -n "$MOZ_ARTIFACT_BUILDS" ]; then
+    BUILD_BACKENDS="FasterMake+RecursiveMake"
+else
+    BUILD_BACKENDS="RecursiveMake FasterMake"
+fi
 
 MOZ_ARG_ENABLE_STRING(build-backend,
 [  --enable-build-backend={$($(dirname ]$[0)/$1/mach python -c "from mozbuild.backend import backends; print ','.join(sorted(backends))")}
                          Enable additional build backends],
-[ BUILD_BACKENDS="RecursiveMake `echo $enableval | sed 's/,/ /g'`"])
+[ BUILD_BACKENDS="$BUILD_BACKENDS `echo $enableval | sed 's/,/ /g'`"])
 
 AC_SUBST_SET([BUILD_BACKENDS])
 ])
diff --git a/configure.in b/configure.in
index 3f23587fdcf..576e76529bf 100644
--- a/configure.in
+++ b/configure.in
@@ -139,8 +139,6 @@ DIST="$MOZ_BUILD_ROOT/dist"
 
 MOZ_PYTHON
 
-MOZ_BUILD_BACKEND(.)
-
 MOZ_DEFAULT_COMPILER
 
 COMPILE_ENVIRONMENT=1
@@ -162,6 +160,8 @@ if test -n "$MOZ_ARTIFACT_BUILDS"; then
     COMPILE_ENVIRONMENT=
 fi
 
+MOZ_BUILD_BACKEND(.)
+
 MOZ_ARG_WITH_STRING(l10n-base,
 [  --with-l10n-base=DIR    path to l10n repositories],
     L10NBASEDIR=$withval)
@@ -4062,8 +4062,6 @@ xulrunner)
   ;;
 esac
 
-BUILD_BACKENDS="$BUILD_BACKENDS FasterMake"
-
 if test -n "$MOZ_B2G"; then
     AC_DEFINE(MOZ_B2G)
 fi