diff options
| author | Amar Takhar <amar@rtems.org> | 2019-12-04 11:53:46 -0500 |
|---|---|---|
| committer | Amar Takhar <verm@darkbeer.org> | 2019-12-04 14:05:32 -0500 |
| commit | 56b2ba5e7da6eed01755d70dcd7fe2e1b19e429f (patch) | |
| tree | b65de151cc46c7462b41923e98664cbb71a10ace /py | |
| parent | e2bb1db588de669bb2ef42fd6e54e2122b20fcf5 (diff) | |
Fix building of BSPs in different source directories than their name.
Also fix missing include directory required by beagle for the testsuite.
Diffstat (limited to 'py')
| -rw-r--r-- | py/waf/tools.py | 1 | ||||
| -rw-r--r-- | py/waf/waf.py | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/py/waf/tools.py b/py/waf/tools.py index 9e6a415319..f08f3bcbc1 100644 --- a/py/waf/tools.py +++ b/py/waf/tools.py @@ -44,6 +44,7 @@ def generate_rtems_config(ctx, file_in, file_out, devel=False): ldflags.append("-specs %s/gcc_spec" % path_bld) ldflags.append("-L%s/cpukit/" % path_bld) ldflags.append("-L%s/c/" % path_bld) + ldflags.append("-L%s/bsps/arm/beagle/" % path_bld) # ldflags.append("-Wl,-T %s/c/linkcmds" % path_bld) # bsps[bsp]["ldflags"] = ldflags + bsps[bsp]["libs"] bsps[bsp]["ldflags"] += ldflags + ["-Wl,-start-group"] + bsps[bsp]["libs"] + ["-lc"] + ["-lgcc"] + ["-Wl,-end-group"] diff --git a/py/waf/waf.py b/py/waf/waf.py index 3988dbf5cb..498120cda4 100644 --- a/py/waf/waf.py +++ b/py/waf/waf.py @@ -354,6 +354,7 @@ def re_fix_linkcmds(self): linkcmds = self.env.LINKCMDS[0] assert linkcmds assert self.link_task + for x in ('linkcmds_linkcmds', 'linkcmds_base', 'start_start_o'): tg = self.bld.get_tgen_by_name(x) tg.post() @@ -367,7 +368,7 @@ USELIB_VARS['test_cprogram'] = set(['STLIB', 'STLIBPATH', 'LDFLAGS']) #from StringIO import StringIO from os import fdopen, pipe, read, close class test_cprogram(cprogram): - run_str = '${LINK_CC} ${LDFLAGS} ${CFLAGS} ${CCLNK_SRC_F}${SRC} ${CCLNK_TGT_F}${TGT[0].abspath()} -specs gcc_spec -Wl,-Bstatic -Lc -Lcpukit -Wl,-start-group -lc -lgcc ${STLIBPATH_ST:STLIBPATH} ${STLIB_ST:STLIB} -Wl,-end-group' + run_str = '${LINK_CC} ${LDFLAGS} ${CFLAGS} ${CCLNK_SRC_F}${SRC} ${CCLNK_TGT_F}${TGT[0].abspath()} -specs gcc_spec -Wl,-Bstatic -Lc -Lcpukit -Lbsps/${RTEMS_ARCH}/${BSP_SOURCE_DIR} -Wl,-start-group -lc -lgcc ${STLIBPATH_ST:STLIBPATH} ${STLIB_ST:STLIB} -Wl,-end-group' def exec_command(self, cmd, **kw): r, w = pipe() |