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-16 08:06:16 +0100 |
| commit | 5aa22c60afd445de7dda00e168a4adb4e09d236e (patch) | |
| tree | 27e1489ca657a6d30277a02a1b926f819e115c63 | |
| parent | Rename kernel space log() to _bsd_log() (diff) | |
| download | rtems-libbsd-5aa22c60afd445de7dda00e168a4adb4e09d236e.tar.bz2 | |
Update rtems_waf module
| 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 b548c77d81e390a40d4afba8afc35c8175191f0 diff --git a/waf_generator.py b/waf_generator.py index ff550313..9e481d05 100755 --- a/waf_generator.py +++ b/waf_generator.py @@ -549,14 +549,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]),') @@ -1127,7 +1127,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', ''), @@ -1148,7 +1148,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]), |