summaryrefslogtreecommitdiffstats
path: root/waf_libbsd.py
diff options
context:
space:
mode:
authorChristian Mauderer <christian.mauderer@embedded-brains.de>2018-04-25 12:50:26 +0200
committerChristian Mauderer <christian.mauderer@embedded-brains.de>2018-05-03 07:09:46 +0200
commit821976e8255ac8de3179803b5c85de51a971781d (patch)
treed556248ebcf21eea5cca751a04d275129b4e9ce3 /waf_libbsd.py
parent634b3bfeced03b290823890d8920194bd78b9355 (diff)
downloadrtems-libbsd-821976e8255ac8de3179803b5c85de51a971781d.tar.bz2
waf: Fix usage of build-include from config.
Diffstat (limited to 'waf_libbsd.py')
-rw-r--r--waf_libbsd.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/waf_libbsd.py b/waf_libbsd.py
index fd89c394..2ce856b2 100644
--- a/waf_libbsd.py
+++ b/waf_libbsd.py
@@ -185,6 +185,7 @@ class Builder(builder.ModuleManager):
# Include paths
#
includes = []
+ buildinclude = 'build-include'
if 'cpu-include-paths' in config:
cpu = bld.get_env()['RTEMS_ARCH']
if cpu == "i386":
@@ -194,7 +195,10 @@ class Builder(builder.ModuleManager):
if 'include-paths' in config:
includes += config['include-paths']
if 'build-include-path' in config:
- includes += config['build-include-path']
+ buildinclude = config['build-include-path']
+ if not isinstance(buildinclude, basestring):
+ buildinclude = buildinclude[0]
+ includes += [buildinclude]
#
# Collect the libbsd uses
@@ -242,7 +246,7 @@ class Builder(builder.ModuleManager):
hp for hp in config['header-paths'] if hp[2] != '' and not hp[0].endswith(hp[2])
]
for headers in header_build_copy_paths:
- target = os.path.join("build-include", headers[2])
+ target = os.path.join(buildinclude, headers[2])
start_dir = bld.path.find_dir(headers[0])
for header in start_dir.ant_glob(headers[1]):
relsourcepath = header.path_from(start_dir)