rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-07-26 14:32:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

waf_generator.py: Move arch header includes

Browse Source 
Make sure that architecture specific header files are found first.
This commit is contained in:
Sebastian Huber 2015-07-31 11:55:18 +02:00
parent a3ef8e6a47
commit 88205a560b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
waf_generator.py
View File

@ -322,10 +322,10 @@ class ModuleManager(builder.ModuleManager):
self.add('') self.add('')
self.add(' # Include paths') self.add(' # Include paths')
self.add(' includes = ["."]') 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(' for i in %r:' % (builder.cpu_includes()))
self.add(' includes += ["%s" % (i[2:].replace("@CPU@", bld.get_env()["RTEMS_ARCH"]))]') 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('')
self.add(' # Support dummy PIC IRQ includes') self.add(' # Support dummy PIC IRQ includes')
self.add(' if bld.get_env()["RTEMS_ARCH"] not in ("arm", "i386", "lm32", "mips", "powerpc", "sparc", "m68k"):') self.add(' if bld.get_env()["RTEMS_ARCH"] not in ("arm", "i386", "lm32", "mips", "powerpc", "sparc", "m68k"):')

4
wscript
View File

@ -73,6 +73,8 @@ def build(bld):
# Include paths # Include paths
includes = ["."] 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 += ["rtemsbsd/include"]
includes += ["freebsd/sys"] includes += ["freebsd/sys"]
includes += ["freebsd/sys/contrib/altq"] includes += ["freebsd/sys/contrib/altq"]
@ -91,8 +93,6 @@ def build(bld):
includes += ["mDNSResponder/mDNSShared"] includes += ["mDNSResponder/mDNSShared"]
includes += ["mDNSResponder/mDNSPosix"] includes += ["mDNSResponder/mDNSPosix"]
includes += ["testsuite/include"] 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 # Support dummy PIC IRQ includes
if bld.get_env()["RTEMS_ARCH"] not in ("arm", "i386", "lm32", "mips", "powerpc", "sparc", "m68k"): if bld.get_env()["RTEMS_ARCH"] not in ("arm", "i386", "lm32", "mips", "powerpc", "sparc", "m68k"):