summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2014-09-22 08:21:16 +1000
committerChris Johns <chrisj@rtems.org>2014-09-22 08:21:16 +1000
commit7bcf72b72ec42f2feedac5f5cc5f2f57d50b5d2b (patch)
treedb927cc4f9f59256ec7ee1de96530ff269aabf9d
parentClean up the rtems-tld support. (diff)
downloadrtems_waf-7bcf72b72ec42f2feedac5f5cc5f2f57d50b5d2b.tar.bz2
Fix the rtems-tld wrapper option.
-rw-r--r--rtems.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/rtems.py b/rtems.py
index c83aeef..982ba24 100644
--- a/rtems.py
+++ b/rtems.py
@@ -186,6 +186,8 @@ def configure(conf, bsp_configure = None):
conf.env.LINKFLAGS = cflags['cflags'] + ldflags['ldflags']
conf.env.LIB = flags['LIB']
+ conf.env.RTRACE_WRAPPER_ST = '-W %s'
+
#
# Checks for various RTEMS features.
#
@@ -736,7 +738,7 @@ class rap(link_task):
class rtrace(link_task):
"Link object files into a RTEMS trace application"
- 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}'
+ run_str = '${RTEMS_TLD} ${RTACE_FLAGS} ${RTRACE_WRAPPER_ST: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 = ['RTRACE_FLAGS', 'RTRACE_CFG', 'RTRACE_WRAPER', 'RTRACE_LINKFLAGS', 'LINKDEPS']
inst_to = '${BINDIR}'