diff options
| author | Chris Johns <chrisj@rtems.org> | 2018-10-07 20:59:45 +1100 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2018-10-21 09:49:02 +1100 |
| commit | 13f4c379997b53b204d8534d198da2fa35dd5630 (patch) | |
| tree | f7591495c8f2165af7bbb20d4eaf743d3d034416 /source-builder/defaults.mc | |
| parent | rtems-tools-5-1.cfg: Bump to latest (diff) | |
| download | rtems-source-builder-13f4c379997b53b204d8534d198da2fa35dd5630.tar.bz2 | |
sb: Add support to search for a suitable version of python.
The command python has been removed from upstream python and python2
and python3 is now used. This patch wraps the commands in a shell
script that locates a suitable python to run.
Updates #3537
Diffstat (limited to 'source-builder/defaults.mc')
| -rw-r--r-- | source-builder/defaults.mc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source-builder/defaults.mc b/source-builder/defaults.mc index 3f9ff9f..aa1a5e6 100644 --- a/source-builder/defaults.mc +++ b/source-builder/defaults.mc @@ -65,9 +65,11 @@ _uid: none, convert, '%(%{__id_u} -n)' # the tools will run on and build is the host building the tools. host_cflags: none, convert, '-O2 -pipe' host_cxxflags: none, convert, '-O2 -pipe' +host_ldflags: none, convert, '' host_includes: none, convert, '' build_cflags: none, convert, '-O2 -pipe' build_cxxflags: none, convert, '-O2 -pipe' +build_ldflags: none, convert, '' build_includes: none, convert, '' # Extra path a platform can override. @@ -202,10 +204,10 @@ SB_BUILD_DIR="%{_builddir}" SB_HOST_CPPFLAGS="%{host_includes}" SB_HOST_CFLAGS="%{host_cflags} %{host_includes}" SB_HOST_CXXFLAGS="%{host_cxxflags} %{host_includes}" -SB_HOST_LDFLAGS="%{?host_ldflags:%{host_ldflags}} %{?_tmproot:-L%{_tmproot}/${SB_PREFIX_CLEAN}/lib}" +SB_HOST_LDFLAGS="%{host_ldflags} %{?_tmproot:-L%{_tmproot}/${SB_PREFIX_CLEAN}/lib}" SB_BUILD_CFLAGS="%{build_cflags} %{?_tmproot:-I%{_tmproot}/${SB_PREFIX_CLEAN}/include}" SB_BUILD_CXXFLAGS="%{build_cxxflags} %{?_tmproot:-I%{_tmproot}/${SB_PREFIX_CLEAN}/include}" -SB_BUILD_LDFLAGS="%{?build_ldflags:%{build_ldflags}} %{?_tmproot:-L%{_tmproot}/${SB_PREFIX_CLEAN}/lib}" +SB_BUILD_LDFLAGS="%{build_ldflags} %{?_tmproot:-L%{_tmproot}/${SB_PREFIX_CLEAN}/lib}" SB_CFLAGS="${SB_BUILD_CFLAGS} %{build_includes}" SB_CXXFLAGS="${SB_BUILD_CXXFLAGS} %{build_includes}" SB_ARCH="%{_arch}" |