[rtems-tools commit] Add Windows includes so the rtemstoolkit builds.

Chris Johns chrisj at rtems.org
Sun Sep 10 21:15:37 UTC 2017


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

Author:    Chris Johns <chrisj at rtems.org>
Date:      Mon Sep 11 07:11:19 2017 +1000

Add Windows includes so the rtemstoolkit builds.

Closes #3128.

---

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

diff --git a/tester/covoar/wscript b/tester/covoar/wscript
index 4d85562..392acd1 100644
--- a/tester/covoar/wscript
+++ b/tester/covoar/wscript
@@ -49,11 +49,6 @@ out = 'build'
 def init(ctx):
     pass
 
-rtl_includes = ['../../rtemstoolkit',
-		'../../rtemstoolkit/elftoolchain/common',
-		'../../rtemstoolkit/elftoolchain/libelf',
-		'../../rtemstoolkit/libiberty']
-
 def options(opt):
     opt.load('compiler_cxx')
 
@@ -66,6 +61,14 @@ def configure(conf):
     conf.env.STLIB_RLD = ['rld','iberty','elf']
 
 def build(bld):
+    rtemstoolkit = '../../rtemstoolkit'
+    rtl_includes = [rtemstoolkit,
+		    rtemstoolkit + '/elftoolchain/libelf',
+		    rtemstoolkit + '/elftoolchain/common',
+		    rtemstoolkit + '/libiberty']
+    if bld.env.DEST_OS == 'win32':
+        rtl_includes += [rtemstoolkit + '/win32']
+
     bld.stlib(target = 'ccovoar',
               source = ['app_common.cc',
                         'CoverageFactory.cc',




More information about the vc mailing list