waf_generator.py: Move arch header includes

Make sure that architecture specific header files are found first.

2 files changed, 4 insertions, 4 deletions

diff --git a/waf_generator.py b/waf_generator.py
index ff550313..7ae5a2aa 100755
--- a/waf_generator.py
+++ b/waf_generator.py
@@ -322,10 +322,10 @@ class ModuleManager(builder.ModuleManager):
         self.add('')
         self.add('    # Include paths')
         self.add('    includes = ["."]')
-        for i in builder.includes():
-            self.add('    includes += ["%s"]' % (i[2:]))
         self.add('    for i in %r:' % (builder.cpu_includes()))
         self.add('        includes += ["%s" % (i[2:].replace("@CPU@", bld.get_env()["RTEMS_ARCH"]))]')
+        for i in builder.includes():
+            self.add('    includes += ["%s"]' % (i[2:]))
         self.add('')
         self.add('    # Support dummy PIC IRQ includes')
         self.add('    if bld.get_env()["RTEMS_ARCH"] not in ("arm", "i386", "lm32", "mips", "powerpc", "sparc", "m68k"):')
diff --git a/wscript b/wscript
index 77dcd9f1..8c0c242d 100644
--- a/wscript
+++ b/wscript
@@ -73,6 +73,8 @@ def build(bld):
 
     # Include paths
     includes = ["."]
+    for i in ['-Irtemsbsd/@CPU@/include', '-Ifreebsd/sys/@CPU@/include']:
+        includes += ["%s" % (i[2:].replace("@CPU@", bld.get_env()["RTEMS_ARCH"]))]
     includes += ["rtemsbsd/include"]
     includes += ["freebsd/sys"]
     includes += ["freebsd/sys/contrib/altq"]
@@ -91,8 +93,6 @@ def build(bld):
     includes += ["mDNSResponder/mDNSShared"]
     includes += ["mDNSResponder/mDNSPosix"]
     includes += ["testsuite/include"]
-    for i in ['-Irtemsbsd/@CPU@/include', '-Ifreebsd/sys/@CPU@/include']:
-        includes += ["%s" % (i[2:].replace("@CPU@", bld.get_env()["RTEMS_ARCH"]))]
 
     # Support dummy PIC IRQ includes
     if bld.get_env()["RTEMS_ARCH"] not in ("arm", "i386", "lm32", "mips", "powerpc", "sparc", "m68k"):