summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2020-09-27 09:35:06 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2020-09-27 09:35:06 +0200
commitb8d84015a4bc30f280b3e39f3f806e1ec0b2ec7a (patch)
tree54df1bab9441d47c9dd661ef4e685ee8f1e6721b
parent9a27c9cfd8b661af7b1135c3cb17896e61551abd (diff)
downloadrtems-b8d84015a4bc30f280b3e39f3f806e1ec0b2ec7a.tar.bz2
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.
-rwxr-xr-xwscript3
1 files changed, 2 insertions, 1 deletions
diff --git a/wscript b/wscript
index 5a6400e66d..e5ac53fbf1 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