summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2015-09-29 10:43:33 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2015-09-29 10:43:33 +0200
commit28bfb6bd39c6c77a4042a611eb6f90216bdf0980 (patch)
tree6a958bede4b865d43482944a6e8ced974c362af3
parentaf3944c7549f64e59abdbabf58f0ae49323a2ea9 (diff)
downloadrtems-libbsd-28bfb6bd39c6c77a4042a611eb6f90216bdf0980.tar.bz2
waf: Add x86 include paths for i386 arch
-rwxr-xr-xwaf_generator.py3
-rw-r--r--wscript3
2 files changed, 6 insertions, 0 deletions
diff --git a/waf_generator.py b/waf_generator.py
index e561df1f..f5392167 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 9246025f..99acad5a 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"]