diff options
| -rwxr-xr-x | waf_generator.py | 3 | ||||
| -rw-r--r-- | wscript | 3 |
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('') @@ -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"] |