[rtems-tools commit] covoar/wscript: Add paths to rtemstoolkit to build.

[Chris Johns]

Module:    rtems-tools
Branch:    master
Commit:    4cee5c3d2fa86afc10133d8d93a5d421b1a82c85
Changeset: http://git.rtems.org/rtems-tools/commit/?id=4cee5c3d2fa86afc10133d8d93a5d421b1a82c85

Author:    Krzysztof Miesowicz <krzysztof.miesowicz at gmail.com>
Date:      Sat Aug 26 09:15:55 2017 +0100

covoar/wscript: Add paths to rtemstoolkit to build.

Co-Author: Cillian O'Donnell <cpodonnell8 at gmail.com>

---

 tester/covoar/wscript | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/tester/covoar/wscript b/tester/covoar/wscript
index 68184a7..d121a21 100644
--- a/tester/covoar/wscript
+++ b/tester/covoar/wscript
@@ -49,6 +49,11 @@ out = 'build'
 def init(ctx):
     pass
 
+rtl_includes = ['../../rtemstoolkit',
+		'../../rtemstoolkit/elftoolchain/common',
+		'../../rtemstoolkit/elftoolchain/libelf',
+		'../../rtemstoolkit/libiberty']
+
 def options(opt):
     opt.load('compiler_cxx')
 
@@ -57,6 +62,8 @@ 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):
     bld.stlib(target = 'ccovoar',
@@ -94,7 +101,8 @@ def build(bld):
                         'Target_powerpc.cc',
                         'Target_sparc.cc'],
               cflags = ['-O2', '-g'],
-              includes = ['.'])
+              cxxflags = ['-std=c++11', '-O2', '-g'],
+              includes = ['.'] + rtl_includes)
 
     bld.program(target = 'trace-converter',
                 source = ['TraceConverter.cc',
@@ -103,12 +111,12 @@ def build(bld):
                           'TraceReaderLogQEMU.cc',
                           'TraceWriterBase.cc',
                           'TraceWriterQEMU.cc'],
-                use = 'ccovoar',
+                use = ['ccovoar','RLD'],
                 cflags = ['-O2', '-g'],
-                includes = ['.'])
+                includes = ['.'] + rtl_includes)
 
     bld.program(target = 'covoar',
                 source = ['covoar.cc'],
-                use = 'ccovoar',
+                use = ['ccovoar','RLD'],
                 cflags = ['-O2', '-g'],
-                includes = ['.'])
+                includes = ['.'] + rtl_includes)