diff options
| author | Chris Johns <chrisj@rtems.org> | 2017-10-13 09:31:47 -0700 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2017-10-13 09:31:47 -0700 |
| commit | 0054585256208db81a0660f439321afbe2b42df0 (patch) | |
| tree | 9b3e021e60f2633a556eacb0839716d15e86ce8f | |
| parent | linkers: Update due to API changes (diff) | |
| download | rtems-tools-0054585256208db81a0660f439321afbe2b42df0.tar.bz2 | |
tester/covoar: Use standard waf modules for linking.
Use the standard modules `use` option for building executables and
let waf figure out the platform specifics.
Closes #3190.
| -rw-r--r-- | tester/covoar/wscript | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tester/covoar/wscript b/tester/covoar/wscript index 392acd1..9db4815 100644 --- a/tester/covoar/wscript +++ b/tester/covoar/wscript @@ -57,8 +57,6 @@ def configure(conf): conf.check_cc(function_name='open64', header_name="stdlib.h", mandatory = False) conf.check_cc(function_name='stat64', header_name="stdlib.h", mandatory = False) conf.write_config_header('covoar-config.h') - conf.env.STLIBPATH_RLD = conf.path.abspath() + '/../../build/rtemstoolkit' - conf.env.STLIB_RLD = ['rld','iberty','elf'] def build(bld): rtemstoolkit = '../../rtemstoolkit' @@ -69,6 +67,11 @@ def build(bld): if bld.env.DEST_OS == 'win32': rtl_includes += [rtemstoolkit + '/win32'] + # + # The list of modules. + # + modules = ['rld', 'elf', 'iberty'] + bld.stlib(target = 'ccovoar', source = ['app_common.cc', 'CoverageFactory.cc', @@ -113,12 +116,12 @@ def build(bld): 'TraceReaderLogQEMU.cc', 'TraceWriterBase.cc', 'TraceWriterQEMU.cc'], - use = ['ccovoar','RLD'], + use = ['ccovoar'] + modules, cflags = ['-O2', '-g'], includes = ['.'] + rtl_includes) bld.program(target = 'covoar', source = ['covoar.cc'], - use = ['ccovoar','RLD'], + use = ['ccovoar'] + modules, cflags = ['-O2', '-g'], includes = ['.'] + rtl_includes) |