[PATCH] build: Prefer variant default value over family

Sebastian Huber sebastian.huber at embedded-brains.de
Thu Jul 15 06:07:10 UTC 2021


Update #4468.
---
 wscript | 8 ++++----
 1 file 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):
-- 
2.26.2



More information about the devel mailing list