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

waf: Fix usage of build-include from config.

Browse Source
This commit is contained in:
Christian Mauderer 2018-04-25 12:50:26 +02:00
parent 634b3bfece
commit 821976e825
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
waf_libbsd.py
View File

@ -185,6 +185,7 @@ class Builder(builder.ModuleManager):
# Include paths # Include paths
# #
includes = [] includes = []
buildinclude = 'build-include'
if 'cpu-include-paths' in config: if 'cpu-include-paths' in config:
cpu = bld.get_env()['RTEMS_ARCH'] cpu = bld.get_env()['RTEMS_ARCH']
if cpu == "i386": if cpu == "i386":
@ -194,7 +195,10 @@ class Builder(builder.ModuleManager):
if 'include-paths' in config: if 'include-paths' in config:
includes += config['include-paths'] includes += config['include-paths']
if 'build-include-path' in config: 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 # 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]) hp for hp in config['header-paths'] if hp[2] != '' and not hp[0].endswith(hp[2])
] ]
for headers in header_build_copy_paths: 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]) start_dir = bld.path.find_dir(headers[0])
for header in start_dir.ant_glob(headers[1]): for header in start_dir.ant_glob(headers[1]):
relsourcepath = header.path_from(start_dir) relsourcepath = header.path_from(start_dir)