[rtems-libbsd commit] waf: Add x86 include paths for i386 arch

[Sebastian Huber]

Module:    rtems-libbsd
Branch:    master
Commit:    28bfb6bd39c6c77a4042a611eb6f90216bdf0980
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=28bfb6bd39c6c77a4042a611eb6f90216bdf0980

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Tue Sep 29 10:43:33 2015 +0200

waf: Add x86 include paths for i386 arch

---

 waf_generator.py | 3 +++
 wscript          | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/waf_generator.py b/waf_generator.py
index e561df1..f539216 100755
--- a/waf_generator.py
+++ b/waf_generator.py
@@ -324,6 +324,9 @@ class ModuleManager(builder.ModuleManager):
         self.add('    includes = []')
         self.add('    for i in %r:' % (builder.cpu_includes()))
         self.add('        includes += ["%s" % (i[2:].replace("@CPU@", bld.get_env()["RTEMS_ARCH"]))]')
+        self.add('    if bld.get_env()["RTEMS_ARCH"] == "i386":')
+        self.add('        for i in %r:' % (builder.cpu_includes()))
+        self.add('            includes += ["%s" % (i[2:].replace("@CPU@", "x86"))]')
         for i in builder.includes():
             self.add('    includes += ["%s"]' % (i[2:]))
         self.add('')
diff --git a/wscript b/wscript
index 9246025..99acad5 100644
--- a/wscript
+++ b/wscript
@@ -75,6 +75,9 @@ def build(bld):
     includes = []
     for i in ['-Irtemsbsd/@CPU@/include', '-Ifreebsd/sys/@CPU@/include']:
         includes += ["%s" % (i[2:].replace("@CPU@", bld.get_env()["RTEMS_ARCH"]))]
+    if bld.get_env()["RTEMS_ARCH"] == "i386":
+        for i in ['-Irtemsbsd/@CPU@/include', '-Ifreebsd/sys/@CPU@/include']:
+            includes += ["%s" % (i[2:].replace("@CPU@", "x86"))]
     includes += ["rtemsbsd/include"]
     includes += ["freebsd/sys"]
     includes += ["freebsd/sys/contrib/altq"]