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

build: Fix option default values

Browse Source 
For the option default values 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:36:07 +02:00
parent b8d84015a4
commit 71ccc156a5
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wscript
View File

@@ -912,7 +912,7 @@ class OptionItem(Item):
value = cic.cp.getboolean(conf.variant, name) value = cic.cp.getboolean(conf.variant, name)
cic.add_option(name) cic.add_option(name)
except configparser.NoOptionError: except configparser.NoOptionError:
value = self.default_value(conf.variant) value = self.default_value(conf.env.ARCH_BSP)
except ValueError as ve: except ValueError as ve:
conf.fatal( conf.fatal(
"Invalid value for configuration option {}: {}".format(name, ve) "Invalid value for configuration option {}: {}".format(name, ve)
@@ -928,7 +928,7 @@ class OptionItem(Item):
value = cic.cp.get(conf.variant, name) value = cic.cp.get(conf.variant, name)
cic.add_option(name) cic.add_option(name)
except configparser.NoOptionError: except configparser.NoOptionError:
value = self.default_value(conf.variant) value = self.default_value(conf.env.ARCH_BSP)
if value is None: if value is None:
return value return value
try: try:
@@ -947,7 +947,7 @@ class OptionItem(Item):
cic.add_option(name) cic.add_option(name)
value = no_unicode(value) value = no_unicode(value)
except configparser.NoOptionError: except configparser.NoOptionError:
value = self.default_value(conf.variant) value = self.default_value(conf.env.ARCH_BSP)
return value return value
def _script(self, conf, cic, value, arg): 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 arch_bsp = arch + "/" + bsp_base
conf.env["ARCH"] = arch conf.env["ARCH"] = arch
conf.env["ARCH_BSP"] = arch_bsp
conf.env["BSP_BASE"] = bsp_base conf.env["BSP_BASE"] = bsp_base
conf.env["BSP_NAME"] = bsp_name conf.env["BSP_NAME"] = bsp_name
conf.env["DEST_OS"] = "rtems" conf.env["DEST_OS"] = "rtems"