summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan van Berkom <tristan@codethink.co.uk>2020-09-21 14:48:07 +0900
committerTristan van Berkom <tristan@codethink.co.uk>2020-09-21 18:29:48 +0900
commit14377d4e4c2fd1021b3f009a2967cfab03a05462 (patch)
tree963e7795c3b6a19b502b9be68c5daab78f90e7bc
parentee43d10c7e16ec0598a2a43402b52a8817c76079 (diff)
downloadbuildstream-14377d4e4c2fd1021b3f009a2967cfab03a05462.tar.gz
Element: Substitute variables on dependency configurations
This was missing in the initial implementation.
-rw-r--r--src/buildstream/element.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/buildstream/element.py b/src/buildstream/element.py
index 06327baf1..9348dff48 100644
--- a/src/buildstream/element.py
+++ b/src/buildstream/element.py
@@ -1122,6 +1122,12 @@ class Element(Plugin):
# Class supports dependency configuration
if dep.config_nodes:
+
+ # Ensure variables are substituted first
+ #
+ for config in dep.config_nodes:
+ element.__variables.expand(config)
+
custom_configurations.extend(
[DependencyConfiguration(dep_proxy, dep.path, config) for config in dep.config_nodes]
)