waf: Add x86 include paths for i386 arch

This commit is contained in:
Sebastian Huber 2015-09-29 10:43:33 +02:00
parent af3944c754
commit 28bfb6bd39
2 changed files with 6 additions and 0 deletions

View File

@ -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('')

View File

@ -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"]