summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2014-09-21 09:00:15 +1000
committerChris Johns <chrisj@rtems.org>2014-09-21 09:00:15 +1000
commitdb8c6f0c31efd09781e1804fcb2f3777d7904209 (patch)
tree363b06b894a07644c8e1e48dd16f4c63602a07c5
parentProvide support for trac linking. (diff)
downloadrtems_waf-db8c6f0c31efd09781e1804fcb2f3777d7904209.tar.bz2
Clean up the rtems-tld support.
-rw-r--r--rtems.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/rtems.py b/rtems.py
index 4caceea..c83aeef 100644
--- a/rtems.py
+++ b/rtems.py
@@ -723,7 +723,8 @@ from waflib import Node
from waflib.Tools.ccroot import link_task, USELIB_VARS
USELIB_VARS['rap'] = set(['RTEMS_LINKFLAGS'])
-USELIB_VARS['rtrace'] = set(['RTEMS_TRACE_CFG'])
+USELIB_VARS['rtrace'] = set(['RTRACE_FLAGS', 'RTRACE_CFG', 'RTRACE_WRAPPER', 'RTRACE_LINKCMDS'])
+
@TaskGen.extension('.c')
class rap(link_task):
@@ -735,7 +736,8 @@ class rap(link_task):
class rtrace(link_task):
"Link object files into a RTEMS trace application"
- run_str = '${RTEMS_TLD} -vvvv -W hello-test -c ${CC} -l ${CC} -C ${RTEMS_TRACE_CFG} -r ${RTEMS_PATH} -B ${ARCH_BSP} -- ${SRC} ${LINKFLAGS} -v -Wl,-Map=chris.map -Wl,--cref -o ${TGT[0].abspath()} ${STLIB_MARKER} ${STLIBPATH_ST:STLIBPATH} ${STLIB_ST:STLIB} ${LIBPATH_ST:LIBPATH} ${LIB_ST:LIB}'
+ run_str = '${RTEMS_TLD} ${RTACE_FLAGS} -W ${RTRACE_WRAPPER} -C ${RTRACE_CFG} -r ${RTEMS_PATH} -B ${ARCH_BSP} -c ${CC} -l ${CC} -- ${SRC} ${LINKFLAGS} ${RTRACE_LINKFLAGS} -o ${TGT[0].abspath()} ${STLIB_MARKER} ${STLIBPATH_ST:STLIBPATH} ${STLIB_ST:STLIB} ${LIBPATH_ST:LIBPATH} ${LIB_ST:LIB}'
ext_out = ['.texe']
- vars = ['RTEMS_TRACE_CFG', 'LINKDEPS']
+ vars = ['RTRACE_FLAGS', 'RTRACE_CFG', 'RTRACE_WRAPER', 'RTRACE_LINKFLAGS', 'LINKDEPS']
inst_to = '${BINDIR}'
+ color = 'PINK'