diff options
| author | Chirayu Desai <cdesai@cyanogenmod.org> | 2013-12-04 15:07:12 +0530 |
|---|---|---|
| committer | Gedare Bloom <gedare@rtems.org> | 2013-12-12 14:55:56 -0500 |
| commit | 72a42499525fb3e501559a360b052684e446dfe4 (patch) | |
| tree | 33f02ba452ed0d27839ef48b051ca6816d14d46b /rtems_waf | |
| parent | hello: Add missing ".exe" suffix to wscript (diff) | |
| download | rtems-examples-72a42499525fb3e501559a360b052684e446dfe4.tar.bz2 | |
waf: Add null check for rtems_tools
If 'waf configure' is called without --rtems-tools, it'll be set to
None, leading to a TypeError.
Traceback (most recent call last):
File "/home/cdesai/bin/.waf-1.7.13-8c328f55ac27cdb03b8c949f189bbac3/waflib/Scripting.py", line 97, in waf_entry_point
run_commands()
File "/home/cdesai/bin/.waf-1.7.13-8c328f55ac27cdb03b8c949f189bbac3/waflib/Scripting.py", line 153, in run_commands
ctx=run_command(cmd_name)
File "/home/cdesai/bin/.waf-1.7.13-8c328f55ac27cdb03b8c949f189bbac3/waflib/Scripting.py", line 146, in run_command
ctx.execute()
File "/home/cdesai/bin/.waf-1.7.13-8c328f55ac27cdb03b8c949f189bbac3/waflib/Configure.py", line 128, in execute
super(ConfigurationContext,self).execute()
File "/home/cdesai/bin/.waf-1.7.13-8c328f55ac27cdb03b8c949f189bbac3/waflib/Context.py", line 87, in execute
self.recurse([os.path.dirname(g_module.root_path)])
File "/home/cdesai/bin/.waf-1.7.13-8c328f55ac27cdb03b8c949f189bbac3/waflib/Context.py", line 128, in recurse
user_function(self)
File "/home/cdesai/rtems/examples-v2/wscript", line 29, in configure
rtems.configure(conf)
File "/home/cdesai/rtems/examples-v2/rtems_waf/rtems.py", line 158, in configure
tools = _find_tools(conf, arch, [rtems_path] + rtems_tools, tools)
TypeError: can only concatenate list (not "NoneType") to list
Diffstat (limited to 'rtems_waf')
| -rw-r--r-- | rtems_waf/rtems.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/rtems_waf/rtems.py b/rtems_waf/rtems.py index 8b312dc..59047f3 100644 --- a/rtems_waf/rtems.py +++ b/rtems_waf/rtems.py @@ -134,6 +134,9 @@ def configure(conf): conf.options.rtems_archs, conf.options.rtems_bsps) + if rtems_tools is None: + conf.fatal('RTEMS tools not found.') + _log_header(conf) conf.msg('Architectures', ', '.join(archs), 'YELLOW') |