mirror of
https://gitlab.rtems.org/rtems/rtos/rtems.git
synced 2025-12-05 15:15:44 +00:00
build: Merge default-by-family into by-variant
Prefix the BSP family name with "bsps/" to make it distinct to the BSP variant names. Update #4468.
This commit is contained in:
10
wscript
10
wscript
@@ -698,10 +698,12 @@ class OptionItem(Item):
|
||||
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
|
||||
else:
|
||||
family = "bsps/" + family
|
||||
for default in self.data["default-by-variant"]:
|
||||
if OptionItem._is_variant(default["variants"], family):
|
||||
value = default["value"]
|
||||
break
|
||||
if value is None:
|
||||
return value
|
||||
if isinstance(value, list):
|
||||
|
||||
Reference in New Issue
Block a user