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:43:07 +0900 |
| commit | 727f2faa307938f95928ee1e7e4ce961e760d92e (patch) | |
| tree | 662499077d73572e372a466e5cec3842eb9509e9 | |
| parent | b9c5ff7d395a66268ec30c46d95b0fcb8ea4b952 (diff) | |
| download | buildstream-727f2faa307938f95928ee1e7e4ce961e760d92e.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 f0ca3d71b..03a783e48 100644 --- a/buildstream/_project.py +++ b/buildstream/_project.py @@ -598,7 +598,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') |