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

waf: Move the tools/BSP include path to be last

Browse Source 
- This change lets you rebuild libbsd after it is installed
This commit is contained in:
Chris Johns 2021-10-20 13:47:29 +11:00
parent f94a67a68d
commit 6ee31ae968
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
waf_libbsd.py
View File

@ -2,7 +2,7 @@
"""LibBSD build configuration to waf integration module. """LibBSD build configuration to waf integration module.
""" """
# Copyright (c) 2015, 2020 Chris Johns <chrisj@rtems.org>. All rights reserved. # Copyright (c) 2015, 2021 Chris Johns <chrisj@rtems.org>. All rights reserved.
# #
# Copyright (c) 2009, 2015 embedded brains GmbH. All rights reserved. # Copyright (c) 2009, 2015 embedded brains GmbH. All rights reserved.
# #
@ -62,6 +62,13 @@ def _add_flags_if_not_present(current_flags, addional_flags):
if flag not in current_flags: if flag not in current_flags:
current_flags.append(flag) current_flags.append(flag)
def _remove_bsp_include_path(bsp_include_path, current_flags):
# this does not handle quted strings; maybe needed
for bsp_path in bsp_include_path:
if bsp_path in current_flags:
current_flags = [flag for flag in current_flags if flag != bsp_path]
return current_flags
# #
# The waf builder for libbsd. # The waf builder for libbsd.
# #
@ -191,6 +198,12 @@ class Builder(builder.ModuleManager):
_add_flags_if_not_present(conf.env.CFLAGS, section_flags) _add_flags_if_not_present(conf.env.CFLAGS, section_flags)
_add_flags_if_not_present(conf.env.CXXFLAGS, section_flags) _add_flags_if_not_present(conf.env.CXXFLAGS, section_flags)
_add_flags_if_not_present(conf.env.LINKFLAGS, ["-Wl,--gc-sections"]) _add_flags_if_not_present(conf.env.LINKFLAGS, ["-Wl,--gc-sections"])
conf.env.CFLAGS = _remove_bsp_include_path(conf.env.IFLAGS,
conf.env.CFLAGS)
conf.env.CXXFLAGS = _remove_bsp_include_path(conf.env.IFLAGS,
conf.env.CXXFLAGS)
conf.env.LINKFLAGS = _remove_bsp_include_path(conf.env.IFLAGS,
conf.env.LINKFLAGS)
def build(self, bld): def build(self, bld):
# #
@ -237,7 +250,7 @@ class Builder(builder.ModuleManager):
inc_paths = sorted(include_paths) inc_paths = sorted(include_paths)
inc_paths.remove('build') inc_paths.remove('build')
inc_paths.remove('cpu') inc_paths.remove('cpu')
includes = {} includes = { 'bsp': [p[2:] for p in bld.env.IFLAGS] }
for inc in inc_paths: for inc in inc_paths:
includes[inc] = include_paths[inc] includes[inc] = include_paths[inc]
# cpu include paths must be the first searched # cpu include paths must be the first searched
@ -432,7 +445,7 @@ class Builder(builder.ModuleManager):
bld.objects(target='kvmsymbols', bld.objects(target='kvmsymbols',
features='c', features='c',
cflags=cflags, cflags=cflags,
includes=kvmsymbols_includes + includes['kernel'], includes=kvmsymbols_includes + includes['kernel'] + includes['bsp'],
source=kvmsymbols['files']['all']['default'][0]) source=kvmsymbols['files']['all']['default'][0])
libbsd_use += ["kvmsymbols"] libbsd_use += ["kvmsymbols"]
@ -487,7 +500,7 @@ class Builder(builder.ModuleManager):
bld.objects(target='lex_%s' % (lex['sym']), bld.objects(target='lex_%s' % (lex['sym']),
features='c', features='c',
cflags=cflags, cflags=cflags,
includes=lexIncludes + includes['user'], includes=lexIncludes + includes['user'] + includes['bsp'],
defines=defines + lexDefines, defines=defines + lexDefines,
source=lex['file'][:-2] + '.c') source=lex['file'][:-2] + '.c')
libbsd_use += ['lex_%s' % (lex['sym'])] libbsd_use += ['lex_%s' % (lex['sym'])]
@ -527,7 +540,7 @@ class Builder(builder.ModuleManager):
bld.objects(target='yacc_%s' % (yaccSym), bld.objects(target='yacc_%s' % (yaccSym),
features='c', features='c',
cflags=cflags, cflags=cflags,
includes=yaccIncludes + includes['user'], includes=yaccIncludes + includes['user'] + includes['bsp'],
defines=defines + yaccDefines, defines=defines + yaccDefines,
source=yaccFile[:-2] + '.c') source=yaccFile[:-2] + '.c')
libbsd_use += ['yacc_%s' % (yaccSym)] libbsd_use += ['yacc_%s' % (yaccSym)]
@ -561,7 +574,7 @@ class Builder(builder.ModuleManager):
cflags=cflags + bld_cflags, cflags=cflags + bld_cflags,
cxxflags=cxxflags, cxxflags=cxxflags,
includes=sorted(build.get('includes', [])) + includes=sorted(build.get('includes', [])) +
includes[space], includes[space] + includes['bsp'],
defines=defines, defines=defines,
source=bld_sources) source=bld_sources)
libbsd_use += [target] libbsd_use += [target]
@ -581,7 +594,7 @@ class Builder(builder.ModuleManager):
features='c cxx', features='c cxx',
cflags=cflags, cflags=cflags,
cxxflags=cxxflags, cxxflags=cxxflags,
includes=includes['kernel'], includes=includes['kernel'] + includes['bsp'],
defines=defines, defines=defines,
source=bld_sources, source=bld_sources,
use=libbsd_use) use=libbsd_use)
@ -658,7 +671,7 @@ class Builder(builder.ModuleManager):
bld.program(target='%s.exe' % (testName), bld.program(target='%s.exe' % (testName),
features='cprogram', features='cprogram',
cflags=cflags, cflags=cflags,
includes=includes['user'], includes=includes['user'] + includes['bsp'],
source=test_sources, source=test_sources,
use=['bsd'], use=['bsd'],
lib=libs, lib=libs,