From 32555ff4e18f4f4ec2a05819e88b3581c2589724 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Sat, 7 May 2016 15:22:11 +1000 Subject: Correctly expand the commands for each BSP to build. --- rtems.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'rtems.py') diff --git a/rtems.py b/rtems.py index d0ffa81..46c5c22 100644 --- a/rtems.py +++ b/rtems.py @@ -112,13 +112,14 @@ def init(ctx, filters = None, version = None): variant = x # - # Add the various commands. + # Transform the command to per BSP commands. # - for cmd in ['build', 'clean', 'install']: - if cmd in waflib.Options.commands: - waflib.Options.commands.remove(cmd) + commands = [] + for cmd in waflib.Options.commands: + if cmd in ['build', 'clean', 'install']: for x in arch_bsps: - waflib.Options.commands.insert(0, cmd + '-' + x) + commands += [cmd + '-' + x] + waflib.Options.commands = commands except: pass @@ -772,8 +773,6 @@ from waflib.Tools.ccroot import link_task, USELIB_VARS USELIB_VARS['rap'] = set(['RTEMS_LINKFLAGS']) USELIB_VARS['rtrace'] = set(['RTRACE_FLAGS', 'RTRACE_CFG', 'RTRACE_WRAPPER', 'RTRACE_LINKCMDS']) -@TaskGen.extension('.c') - class rap(link_task): "Link object files into a RTEMS application" run_str = '${RTEMS_LD} ${RTEMS_LINKFLAGS} --cc ${CC} ${SRC} -o ${TGT[0].abspath()} ${STLIB_MARKER} ${STLIBPATH_ST:STLIBPATH} ${STLIB_ST:STLIB} ${LIBPATH_ST:LIBPATH} ${LIB_ST:LIB}' -- cgit v1.2.3