summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2020-09-27 09:36:07 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2020-09-27 09:36:07 +0200
commit71ccc156a55af6abda1be611610ceb0420c5e923 (patch)
treef154a5c36b57133adca3a2a3ec706e38437a598e
parentb8d84015a4bc30f280b3e39f3f806e1ec0b2ec7a (diff)
downloadrtems-71ccc156a55af6abda1be611610ceb0420c5e923.tar.bz2
build: Fix option default values
For the option default values we have to use the BSP name defined by the build specification and not the user. Update #3818.
-rwxr-xr-xwscript7
1 files changed, 4 insertions, 3 deletions
diff --git a/wscript b/wscript
index e5ac53fbf1..6280afa6c9 100755
--- a/wscript
+++ b/wscript
@@ -912,7 +912,7 @@ class OptionItem(Item):
value = cic.cp.getboolean(conf.variant, name)
cic.add_option(name)
except configparser.NoOptionError:
- value = self.default_value(conf.variant)
+ value = self.default_value(conf.env.ARCH_BSP)
except ValueError as ve:
conf.fatal(
"Invalid value for configuration option {}: {}".format(name, ve)
@@ -928,7 +928,7 @@ class OptionItem(Item):
value = cic.cp.get(conf.variant, name)
cic.add_option(name)
except configparser.NoOptionError:
- value = self.default_value(conf.variant)
+ value = self.default_value(conf.env.ARCH_BSP)
if value is None:
return value
try:
@@ -947,7 +947,7 @@ class OptionItem(Item):
cic.add_option(name)
value = no_unicode(value)
except configparser.NoOptionError:
- value = self.default_value(conf.variant)
+ value = self.default_value(conf.env.ARCH_BSP)
return value
def _script(self, conf, cic, value, arg):
@@ -1358,6 +1358,7 @@ def configure_variant(conf, cp, bsp_map, path_list, top_group, variant):
arch_bsp = arch + "/" + bsp_base
conf.env["ARCH"] = arch
+ conf.env["ARCH_BSP"] = arch_bsp
conf.env["BSP_BASE"] = bsp_base
conf.env["BSP_NAME"] = bsp_name
conf.env["DEST_OS"] = "rtems"