summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2021-07-15 08:06:26 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2021-07-15 08:07:28 +0200
commit6c1928caed28183c2abe405963602a2d4a3116d0 (patch)
treea1be558b2e45a0c61d7f64a384ca65c2aedf9135
parentbuild: Fix bsp_defaults command (diff)
downloadrtems-6c1928caed28183c2abe405963602a2d4a3116d0.tar.bz2
build: Prefer variant default value over family
Update #4468.
-rwxr-xr-xwscript8
1 files changed, 4 insertions, 4 deletions
diff --git a/wscript b/wscript
index 1206c4d882..bba0c1502a 100755
--- a/wscript
+++ b/wscript
@@ -694,14 +694,14 @@ class OptionItem(Item):
def default_value(self, variant, family):
value = self.data["default"]
- for default in self.data["default-by-family"]:
- if OptionItem._is_variant(default["families"], family):
- value = default["value"]
- break
for default in self.data["default-by-variant"]:
if OptionItem._is_variant(default["variants"], variant):
value = default["value"]
break
+ for default in self.data["default-by-family"]:
+ if OptionItem._is_variant(default["families"], family):
+ value = default["value"]
+ break
if value is None:
return value
if isinstance(value, list):