diff options
author | Matt A. Tobin <email@mattatobin.com> | 2021-10-30 19:05:33 -0400 |
---|---|---|
committer | Matt A. Tobin <email@mattatobin.com> | 2021-10-30 19:05:33 -0400 |
commit | d6ea3201b3f578d8590fddb395759483e75b6221 (patch) | |
tree | add1ee9c886bda910cb32df2ba6665dd50dfa172 /moz.configure | |
parent | abc16648c3bcccd785ab5708f02f39947d7dd3fa (diff) | |
download | aura-central-d6ea3201b3f578d8590fddb395759483e75b6221.tar.gz |
Issue %3031 - Remove FasterMake/FasterMake+RecursiveMake
- This includes anything to do with artifact builds.
- This also removes configure options to specify build-backends and hardcodes RecursiveMake
Diffstat (limited to 'moz.configure')
-rw-r--r-- | moz.configure | 67 |
1 files changed, 3 insertions, 64 deletions
diff --git a/moz.configure b/moz.configure index 68450543f..633aaf689 100644 --- a/moz.configure +++ b/moz.configure @@ -11,33 +11,6 @@ include('build/moz.configure/init.configure') # - Spidermonkey-specific options and rules should go in js/moz.configure. # - etc. -option('--enable-artifact-builds', env='MOZ_ARTIFACT_BUILDS', - help='Download and use prebuilt binary artifacts.') - -@depends('--enable-artifact-builds') -def artifact_builds(value): - if value: - return True - -set_config('MOZ_ARTIFACT_BUILDS', artifact_builds) - -imply_option('--enable-artifact-build-symbols', - depends(artifact_builds)(lambda v: False if v is None else None), - reason='--disable-artifact-builds') - -option('--enable-artifact-build-symbols', - help='Download symbols when artifact builds are enabled.') - -set_config('MOZ_ARTIFACT_BUILD_SYMBOLS', - depends_if('--enable-artifact-build-symbols')(lambda _: True)) - -@depends('--enable-artifact-builds') -def imply_disable_compile_environment(value): - if value: - return False - -imply_option('--enable-compile-environment', imply_disable_compile_environment) - option('--disable-compile-environment', help='Disable compiler/library checks') @@ -73,38 +46,8 @@ include('build/moz.configure/warnings.configure', include(include_project_configure) -@depends('--help') -@imports(_from='mozbuild.backend', _import='backends') -def build_backends_choices(_): - return tuple(backends) - - -@deprecated_option('--enable-build-backend', nargs='+', - choices=build_backends_choices) -def build_backend(backends): - if backends: - return tuple('+%s' % b for b in backends) - -imply_option('--build-backends', build_backend) - - -@depends('--enable-artifact-builds', '--disable-compile-environment', '--help') -@imports('sys') -def build_backend_defaults(artifact_builds, compile_environment, _): - if artifact_builds: - all_backends = ['FasterMake+RecursiveMake'] - else: - all_backends = ['RecursiveMake', 'FasterMake'] - return tuple(all_backends) - -option('--build-backends', nargs='+', default=build_backend_defaults, - choices=build_backends_choices, help='Build backends to generate') - -@depends('--build-backends') -def build_backends(backends): - return backends - -set_config('BUILD_BACKENDS', build_backends) +# We only support one build-backend, namely RecursiveMake. +set_config('BUILD_BACKENDS', tuple(['RecursiveMake'])) # Awk detection @@ -183,11 +126,7 @@ check_prog('GMAKE', possible_makes) # tup detection # ============================================================== -@depends(build_backends) -def tup_progs(build_backends): - for backend in build_backends: - if 'Tup' in backend: - return ['tup'] +def tup_progs(): return None tup = check_prog('TUP', tup_progs) |