wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1239217 - Enable the hybrid FasterMake+RecursiveMake backend for artifact builds. r=gps

Browse Source
This commit is contained in:
Mike Hommey 2016-01-22 14:23:03 +09:00
parent 4e70a20392
commit 7048f85971
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/autoconf/config.status.m4
View File

@ -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])
])

6
configure.in
View File

@ -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