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

build: Apply command line options to all variants

Browse Source 
Update #4548.
This commit is contained in:
Sebastian Huber
2022-03-18 14:57:43 +01:00
parent b837c83869
commit 1a5991e4e7
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wscript
View File

@@ -1423,15 +1423,16 @@ def configure_variant(conf, cp, bsp_map, path_list, top_group, variant):
conf.env["TOPGROUP"] = top_group conf.env["TOPGROUP"] = top_group
conf.env["VARIANT"] = variant conf.env["VARIANT"] = variant
prepare_rtems_options(conf)
cic = ConfigItemContext(cp, path_list) cic = ConfigItemContext(cp, path_list)
items[conf.env.TOPGROUP].configure(conf, cic) items[conf.env.TOPGROUP].configure(conf, cic)
bsp_item.configure(conf, cic) bsp_item.configure(conf, cic)
options = set([o[0].upper() for o in cp.items(variant)]) options = set([o[0].upper() for o in cp.items(variant)])
for o in options.difference(cic.options): for o in options.difference(cic.options):
conf.msg("Unknown configuration option", o.upper(), color="RED") conf.msg("Unknown configuration option", o.upper(), color="RED")
for key in conf.rtems_options:
conf.msg("Unknown command line RTEMS option", key, color="RED")
def check_forbidden_options(ctx, opts): def check_forbidden_options(ctx, opts):
@@ -1490,7 +1491,6 @@ def prepare_rtems_options(conf):
def configure(conf): def configure(conf):
check_forbidden_options(conf, ["compiler"]) check_forbidden_options(conf, ["compiler"])
prepare_rtems_options(conf)
check_environment(conf) check_environment(conf)
conf.env["SPECS"] = load_items_from_options(conf) conf.env["SPECS"] = load_items_from_options(conf)
top_group = get_top_group(conf) top_group = get_top_group(conf)
@@ -1504,8 +1504,6 @@ def configure(conf):
configure_variant(conf, cp, bsp_map, path_list, top_group, variant) configure_variant(conf, cp, bsp_map, path_list, top_group, variant)
conf.setenv("") conf.setenv("")
conf.env["VARIANTS"] = variant_list conf.env["VARIANTS"] = variant_list
for key in conf.rtems_options:
conf.msg("Unknown command line RTEMS option", key, color="RED")
def append_variant_builds(bld): def append_variant_builds(bld):