diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2015-11-13 10:58:45 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2015-11-13 10:58:45 +0100 |
commit | a76483d8dd5672f047cc0869bc932da7298b8ae7 (patch) | |
tree | c37e540813501dfa5bb8bdc353f4e610f4a79f0e | |
parent | testsuite/ppp01: Avoid build error on SMP (diff) | |
download | rtems-libbsd-a76483d8dd5672f047cc0869bc932da7298b8ae7.tar.bz2 |
Use latest rtems_waf
m--------- | rtems_waf | 0 | ||||
-rwxr-xr-x | waf_generator.py | 4 | ||||
-rw-r--r-- | wscript | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/rtems_waf b/rtems_waf -Subproject 7bcf72b72ec42f2feedac5f5cc5f2f57d50b5d2 +Subproject 4a549d2b2dff85aec2fe656da90f3b641c92c12 diff --git a/waf_generator.py b/waf_generator.py index a006480c..0fab1233 100755 --- a/waf_generator.py +++ b/waf_generator.py @@ -552,14 +552,14 @@ class ModuleManager(builder.ModuleManager): # Head file collector. # self.add(' # Installs. ') - self.add(' bld.install_files("${PREFIX}/" + rtems.arch_bsp_lib_path(bld.env.RTEMS_ARCH_BSP), ["libbsd.a"])') + self.add(' bld.install_files("${PREFIX}/" + rtems.arch_bsp_lib_path(bld.env.RTEMS_VERSION, bld.env.RTEMS_ARCH_BSP), ["libbsd.a"])') header_paths = builder.header_paths() self.add(' header_paths = [%s,' % (str(header_paths[0]))) for hp in header_paths[1:-1]: self.add(' %s,' % (str(hp))) self.add(' %s]' % (str(header_paths[-1]))) self.add(' for headers in header_paths:') - self.add(' ipath = os.path.join(rtems.arch_bsp_include_path(bld.env.RTEMS_ARCH_BSP), headers[2])') + self.add(' ipath = os.path.join(rtems.arch_bsp_include_path(bld.env.RTEMS_VERSION, bld.env.RTEMS_ARCH_BSP), headers[2])') self.add(' start_dir = bld.path.find_dir(headers[0])') self.add(' bld.install_files("${PREFIX}/" + ipath,') self.add(' start_dir.ant_glob("**/" + headers[1]),') @@ -1102,7 +1102,7 @@ def build(bld): use = libbsd_use) # Installs. - bld.install_files("${PREFIX}/" + rtems.arch_bsp_lib_path(bld.env.RTEMS_ARCH_BSP), ["libbsd.a"]) + bld.install_files("${PREFIX}/" + rtems.arch_bsp_lib_path(bld.env.RTEMS_VERSION, bld.env.RTEMS_ARCH_BSP), ["libbsd.a"]) header_paths = [('rtemsbsd/include', '*.h', ''), ('rtemsbsd/mghttpd', 'mongoose.h', 'mghttpd'), ('freebsd/include', '*.h', ''), @@ -1123,7 +1123,7 @@ def build(bld): ('mDNSResponder/mDNSShared', 'dns_sd.h', ''), ('mDNSResponder/mDNSPosix', 'mDNSPosix.h', '')] for headers in header_paths: - ipath = os.path.join(rtems.arch_bsp_include_path(bld.env.RTEMS_ARCH_BSP), headers[2]) + ipath = os.path.join(rtems.arch_bsp_include_path(bld.env.RTEMS_VERSION, bld.env.RTEMS_ARCH_BSP), headers[2]) start_dir = bld.path.find_dir(headers[0]) bld.install_files("${PREFIX}/" + ipath, start_dir.ant_glob("**/" + headers[1]), |