diff options
| -rwxr-xr-x | waf_generator.py | 6 | ||||
| -rw-r--r-- | wscript | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/waf_generator.py b/waf_generator.py index 800f8a47..0be33676 100755 --- a/waf_generator.py +++ b/waf_generator.py @@ -289,6 +289,10 @@ class ModuleManager(builder.ModuleManager): self.add('def bsp_configure(conf, arch_bsp):') self.add(' conf.check(header_name = "dlfcn.h", features = "c")') self.add(' conf.check(header_name = "rtems/pci.h", features = "c", mandatory = False)') + self.add(' if not rtems.check_posix(conf):') + self.add(' conf.fatal("RTEMS kernel POSIX support is disabled; configure RTEMS with --enable-posix")') + self.add(' if rtems.check_networking(conf):') + self.add(' conf.fatal("RTEMS kernel contains the old network support; configure RTEMS with --disable-networking")') self.add('') self.add('def configure(conf):') self.add(' if conf.options.auto_regen:') @@ -299,8 +303,6 @@ class ModuleManager(builder.ModuleManager): self.add(' conf.env.WARNINGS = conf.options.warnings') self.add(' conf.env.NET_CONFIG = conf.options.net_config') self.add(' rtems.configure(conf, bsp_configure)') - self.add(' if rtems.check_networking(conf):') - self.add(' conf.fatal("RTEMS kernel contains the old network support; configure RTEMS with --disable-networking")') self.add('') self.add('def build(bld):') self.add(' rtems.build(bld)') @@ -38,6 +38,10 @@ def options(opt): def bsp_configure(conf, arch_bsp): conf.check(header_name = "dlfcn.h", features = "c") conf.check(header_name = "rtems/pci.h", features = "c", mandatory = False) + if not rtems.check_posix(conf): + conf.fatal("RTEMS kernel POSIX support is disabled; configure RTEMS with --enable-posix") + if rtems.check_networking(conf): + conf.fatal("RTEMS kernel contains the old network support; configure RTEMS with --disable-networking") def configure(conf): if conf.options.auto_regen: @@ -48,8 +52,6 @@ def configure(conf): conf.env.WARNINGS = conf.options.warnings conf.env.NET_CONFIG = conf.options.net_config rtems.configure(conf, bsp_configure) - if rtems.check_networking(conf): - conf.fatal("RTEMS kernel contains the old network support; configure RTEMS with --disable-networking") def build(bld): rtems.build(bld) |