nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1481340 - Don't generate combinations of make and tup backends in configure. r=gps,firefox-build-system-reviewers

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D2911

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Chris Manchester 2018-08-10 22:30:35 +00:00
parent 130d05505f
commit 87891e399b
1 changed files with 10 additions and 4 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

14
moz.configure
View file

@ -259,10 +259,16 @@ def build_backend(backends):
imply_option('--build-backends', build_backend) 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') @imports('sys')
def build_backend_defaults(artifact_builds, compile_environment, _): def build_backend_defaults(artifact_builds, compile_environment, requested_backends,
if artifact_builds: _):
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'] all_backends = ['FasterMake+RecursiveMake']
else: else:
all_backends = ['RecursiveMake', 'FasterMake'] 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. # and this is not a can of worms we can open at the moment.
if sys.platform == 'win32' and compile_environment: if sys.platform == 'win32' and compile_environment:
all_backends.append('VisualStudio') all_backends.append('VisualStudio')
return tuple(all_backends) return tuple(all_backends) or None
option('--build-backends', nargs='+', default=build_backend_defaults, option('--build-backends', nargs='+', default=build_backend_defaults,
choices=build_backends_choices, help='Build backends to generate') choices=build_backends_choices, help='Build backends to generate')