From 87891e399b1512475d00e1849b273e778288f222 Mon Sep 17 00:00:00 2001 From: Chris Manchester Date: Fri, 10 Aug 2018 22:30:35 +0000 Subject: [PATCH] Bug 1481340 - Don't generate combinations of make and tup backends in configure. r=gps,firefox-build-system-reviewers Differential Revision: https://phabricator.services.mozilla.com/D2911 --HG-- extra : moz-landing-system : lando --- moz.configure | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/moz.configure b/moz.configure index 225459044826..34badec4e4e3 100755 --- a/moz.configure +++ b/moz.configure @@ -259,10 +259,16 @@ def build_backend(backends): imply_option('--build-backends', build_backend) -@depends('--enable-artifact-builds', '--disable-compile-environment', '--help') +@depends('--enable-artifact-builds', '--disable-compile-environment', + '--enable-build-backend', '--help') @imports('sys') -def build_backend_defaults(artifact_builds, compile_environment, _): - if artifact_builds: +def build_backend_defaults(artifact_builds, compile_environment, requested_backends, + _): + if 'Tup' in requested_backends: + # As a special case, if Tup was requested, do not combine it with any + # Make based backend by default. + all_backends = [] + elif artifact_builds: all_backends = ['FasterMake+RecursiveMake'] else: all_backends = ['RecursiveMake', 'FasterMake'] @@ -271,7 +277,7 @@ def build_backend_defaults(artifact_builds, compile_environment, _): # and this is not a can of worms we can open at the moment. if sys.platform == 'win32' and compile_environment: all_backends.append('VisualStudio') - return tuple(all_backends) + return tuple(all_backends) or None option('--build-backends', nargs='+', default=build_backend_defaults, choices=build_backends_choices, help='Build backends to generate')