[rtems commit] build: Fix enabled-by evaluation

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    b8d84015a4bc30f280b3e39f3f806e1ec0b2ec7a
Changeset: http://git.rtems.org/rtems/commit/?id=b8d84015a4bc30f280b3e39f3f806e1ec0b2ec7a

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Sun Sep 27 09:35:06 2020 +0200

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.

---

 wscript | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/wscript b/wscript
index 5a6400e..e5ac53f 100755
--- a/wscript
+++ b/wscript
@@ -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