Find a better solution for conditionally including moz.configure files

RESOLVED FIXED in Firefox 50

Status

defect
RESOLVED FIXED
3 years ago
Last year

People

(Reporter: chmanchester, Assigned: chmanchester)

Tracking

(Blocks 1 bug)

unspecified
mozilla50
Dependency tree / graph

Firefox Tracking Flags

(firefox50 fixed)

Details

Attachments

(1 attachment)

Currently we have quite a few moz.configure files being conditionally included by the root moz.configure, based on whether we're building with --disable-compile-environment. We should templatize this to avoid duplication or find another way to handle the proliferation.
Following a recent pattern, we could have a include_when() template.
Comment on attachment 8774541 [details]
Bug 1287924 - Add a template for conditionally including moz.configure files.

https://reviewboard.mozilla.org/r/66978/#review63936

You could also change android_ndk_include

::: moz.configure:97
(Diff revision 1)
>  
>  add_old_configure_assignment('MOZ_DEBUG',
>                               depends('--enable-debug')(lambda v: bool(v)))
>  
> -@depends('--disable-compile-environment', '--help')
> -def toolchain_include(compile_env, help):
> +include_when('build/moz.configure/toolchain.configure',
> +             '--enable-compile-environment')

An explicit when= might make it a little clearer.
Attachment #8774541 - Flags: review?(mh+mozilla) → review+

Comment 4

3 years ago
Pushed by cmanchester@mozilla.com:
https://hg.mozilla.org/integration/mozilla-inbound/rev/83db605b772e
Add a template for conditionally including moz.configure files. r=glandium
Assignee

Updated

3 years ago
Assignee: nobody → cmanchester

Comment 5

3 years ago
bugherder
https://hg.mozilla.org/mozilla-central/rev/83db605b772e
Status: NEW → RESOLVED
Closed: 3 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla50

Updated

Last year
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.