rtems/rtems-source-builder
1
0
Fork 0
mirror of https://git.rtems.org/rtems-source-builder synced 2024-10-09 07:15:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix C++ build support for cross-compiling RTEMS 3rd party packages.

Browse Source
This commit is contained in:
Chris Johns 2015-01-23 14:31:25 +11:00
parent db6d3eb83a
commit b31d5e2dd9
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rtems/config/rtems-bsp.cfg
View File

@ -47,12 +47,17 @@
%define rtems_bsp_ldflags %{pkgconfig ldflags %{_host}-%{rtems_bsp}} %define rtems_bsp_ldflags %{pkgconfig ldflags %{_host}-%{rtems_bsp}}
%define rtems_bsp_libs %{pkgconfig libs %{_host}-%{rtems_bsp}} %define rtems_bsp_libs %{pkgconfig libs %{_host}-%{rtems_bsp}}
%if %{rtems_bsp_ccflags} == %{nil}
%define rtems_bsp_ccflags %{rtems_bsp_cflags}
%endif
# #
# Map to names used for cross compiling. # Map to names used for cross compiling.
# #
%define host_cflags %{rtems_bsp_cflags} %define host_cflags %{rtems_bsp_cflags}
%define host_ldflags %{rtems_bsp_ldflags} %define host_cxxflags %{rtems_bsp_ccflags}
%define host_libs %{rtems_bsp_libs} %define host_ldflags %{rtems_bsp_ldflags}
%define host_libs %{rtems_bsp_libs}
# #
# Update the configure paths to be BSP specific. # Update the configure paths to be BSP specific.

9
source-builder/defaults.mc
View File

@ -57,6 +57,7 @@ _uid: none, convert, '%(%{__id_u} -n)'
# flags and include paths to the tools. The host is the final platform # flags and include paths to the tools. The host is the final platform
# the tools will run on and build is the host building the tools. # the tools will run on and build is the host building the tools.
host_cflags: none, convert, '-O2 -pipe' host_cflags: none, convert, '-O2 -pipe'
host_cxxflags: none, convert, '-O2 -pipe'
host_includes: none, convert, '' host_includes: none, convert, ''
build_cflags: none, convert, '-O2 -pipe' build_cflags: none, convert, '-O2 -pipe'
build_cxxflags: none, convert, '-O2 -pipe' build_cxxflags: none, convert, '-O2 -pipe'
@ -190,6 +191,7 @@ SB_SOURCE_DIR="%{_sourcedir}"
SB_BUILD_DIR="%{_builddir}" SB_BUILD_DIR="%{_builddir}"
# host == build, use build; host != build , host uses host and build uses build # host == build, use build; host != build , host uses host and build uses build
SB_HOST_CFLAGS="%{host_cflags} %{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:%{host_ldflags}}%{?_tmproot:-L%{_tmproot}/${SB_PREFIX_CLEAN}/lib}"
SB_BUILD_CFLAGS="%{build_cflags} %{?_tmproot:-I%{_tmproot}/${SB_PREFIX_CLEAN}/include}" 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_CXXFLAGS="%{build_cxxflags} %{?_tmproot:-I%{_tmproot}/${SB_PREFIX_CLEAN}/include}"
@ -199,7 +201,9 @@ SB_CXXFLAGS="${SB_BUILD_CXXFLAGS} %{build_includes}"
SB_ARCH="%{_arch}" SB_ARCH="%{_arch}"
SB_OS="%{_os}" SB_OS="%{_os}"
export SB_SOURCE_DIR SB_BUILD_DIR SB_ARCH SB_OS export SB_SOURCE_DIR SB_BUILD_DIR SB_ARCH SB_OS
export SB_HOST_CFLAGS SB_HOST_LDFLAGS SB_BUILD_CFLAGS SB_BUILD_CXXFLAGS SB_BUILD_LDFLAGS SB_CFLAGS SB_CXXFLAGS export SB_HOST_CFLAGS SB_HOST_CXXFLAGS SB_HOST_LDFLAGS
export SB_BUILD_CFLAGS SB_BUILD_CXXFLAGS SB_BUILD_LDFLAGS
export SB_CFLAGS SB_CXXFLAGS
# Documentation # Documentation
SB_DOC_DIR="%{_docdir}" SB_DOC_DIR="%{_docdir}"
export SB_DOC_DIR export SB_DOC_DIR
@ -304,6 +308,7 @@ if test "%{_build}" != "%{_host}" ; then
CC=$(echo "%{_host}-%{_host_cc}" | sed -e 's,-std=gnu99 ,,') CC=$(echo "%{_host}-%{_host_cc}" | sed -e 's,-std=gnu99 ,,')
CXX=$(echo "%{_host}-%{_host_cxx}" | sed -e 's,-std=gnu99 ,,') CXX=$(echo "%{_host}-%{_host_cxx}" | sed -e 's,-std=gnu99 ,,')
CFLAGS="${SB_HOST_CFLAGS}" CFLAGS="${SB_HOST_CFLAGS}"
CXXFLAGS="${SB_HOST_CXXFLAGS}"
LDFLAGS="${SB_HOST_LDFLAGS}" LDFLAGS="${SB_HOST_LDFLAGS}"
# Host # Host
CFLAGS_FOR_HOST="${SB_HOST_CFLAGS}" CFLAGS_FOR_HOST="${SB_HOST_CFLAGS}"
@ -326,7 +331,7 @@ else
CC_FOR_BUILD=${CC} CC_FOR_BUILD=${CC}
CXX_FOR_BUILD=${CXX} CXX_FOR_BUILD=${CXX}
fi fi
export CC CXX CFLAGS LDFLAGS export CC CXX CFLAGS CXXFLAGS LDFLAGS
export CC_FOR_HOST CXX_FOR_HOST CFLAGS_FOR_HOST CXXFLAGS_FOR_HOST LDFLAGS_FOR_HOST export CC_FOR_HOST CXX_FOR_HOST CFLAGS_FOR_HOST CXXFLAGS_FOR_HOST LDFLAGS_FOR_HOST
export CC_FOR_BUILD CXX_FOR_BUILD CFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD LDFLAGS_FOR_BUILD''' export CC_FOR_BUILD CXX_FOR_BUILD CFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD LDFLAGS_FOR_BUILD'''