[rtems commit] build: Prefer variant default value over family

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    6c1928caed28183c2abe405963602a2d4a3116d0
Changeset: http://git.rtems.org/rtems/commit/?id=6c1928caed28183c2abe405963602a2d4a3116d0

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Thu Jul 15 08:06:26 2021 +0200

build: Prefer variant default value over family

Update #4468.

---

 wscript | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/wscript b/wscript
index 1206c4d..bba0c15 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):