RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

build: Fix bsp_defaults command

Browse Source 
Update #4468.
This commit is contained in:
Sebastian Huber
2021-07-15 08:05:30 +02:00
parent 61071489ff
commit b6092cb82c
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wscript
View File

@@ -203,11 +203,11 @@ class Item(object):
def get_enabled_by(self): def get_enabled_by(self):
return self.data["enabled-by"] return self.data["enabled-by"]
def defaults(self, enable, variant): def defaults(self, enable, variant, family):
if _is_enabled(enable, self.get_enabled_by()): if _is_enabled(enable, self.get_enabled_by()):
for p in self.links(): for p in self.links():
p.defaults(enable, variant) p.defaults(enable, variant, family)
self.do_defaults(variant) self.do_defaults(variant, family)
def configure(self, conf, cic): def configure(self, conf, cic):
if _is_enabled(conf.env.ENABLE, self.get_enabled_by()): if _is_enabled(conf.env.ENABLE, self.get_enabled_by()):
@@ -223,7 +223,7 @@ class Item(object):
p.build(bld, bic) p.build(bld, bic)
self.do_build(bld, bic) self.do_build(bld, bic)
def do_defaults(self, variant): def do_defaults(self, variant, family):
return return
def prepare_configure(self, conf, cic): def prepare_configure(self, conf, cic):
@@ -1566,8 +1566,10 @@ COMPILER = {}""".format(
) )
) )
enable = [compiler, arch, variant] enable = [compiler, arch, variant]
items[top_group].defaults(enable, variant) bsp_item = bsps[arch][bsp]
bsps[arch][bsp].defaults(enable, variant) family = arch + "/" + bsp_item.data["family"]
items[top_group].defaults(enable, variant, family)
bsp_item.defaults(enable, variant, family)
if first: if first:
no_matches_error(ctx, white_list) no_matches_error(ctx, white_list)