[PATCH] build: Prefer variant default value over family

Chris Johns chrisj at rtems.org
Thu Jul 15 06:08:51 UTC 2021


Yes this is good thing to do and thanks.

Please push.

Chris

On 15/7/21 4:07 pm, Sebastian Huber wrote:
> 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):
> 


More information about the devel mailing list