build: Fix enabled-by evaluation

For the enabled-by evaluation we have to use the BSP name defined by the
build specification and not the user.

Update #3818.
This commit is contained in:
Sebastian Huber
2020-09-27 09:35:06 +02:00
parent 9a27c9cfd8
commit b8d84015a4

View File

@@ -1355,12 +1355,13 @@ def configure_variant(conf, cp, bsp_map, path_list, top_group, variant):
conf.setenv(variant)
arch, bsp_name = variant.split("/")
bsp_base = bsp_map.get(bsp_name, bsp_name)
arch_bsp = arch + "/" + bsp_base
conf.env["ARCH"] = arch
conf.env["BSP_BASE"] = bsp_base
conf.env["BSP_NAME"] = bsp_name
conf.env["DEST_OS"] = "rtems"
conf.env["ENABLE"] = [get_compiler(conf, cp, variant), arch, variant]
conf.env["ENABLE"] = [get_compiler(conf, cp, variant), arch, arch_bsp]
conf.env["TOP"] = conf.path.abspath()
conf.env["TOPGROUP"] = top_group
conf.env["VARIANT"] = variant