diff options
| author | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2018-09-18 16:43:07 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2018-09-18 16:50:43 +0900 |
| commit | 360614ef6dac729e202b8b8050e6a573faa6c712 (patch) | |
| tree | 80a7df09223819a2d9b97b3d483e1c3db26ea659 | |
| parent | 045797661e914f66d72cdd3c4186d255f001d6dd (diff) | |
| download | buildstream-360614ef6dac729e202b8b8050e6a573faa6c712.tar.gz | |
_project.py: Fix option resolution in element & source overrides
This ensures that option expressions are resolved in the project
level overrides before attempting to composite them on the instantiated
elements. Seems this is a regression from introducing the include
directive.
This fixes issue #658
| -rw-r--r-- | buildstream/_project.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/buildstream/_project.py b/buildstream/_project.py index d5504e201..4a3c075e0 100644 --- a/buildstream/_project.py +++ b/buildstream/_project.py @@ -572,7 +572,10 @@ class Project(): # any conditionals specified for project option declarations, # or conditionally specifying the project name; will be ignored. # + # Don't forget to also resolve options in the element and source overrides. output.options.process_node(config) + output.options.process_node(output.element_overrides) + output.options.process_node(output.source_overrides) # Load base variables output.base_variables = _yaml.node_get(config, Mapping, 'variables') |