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

sb: Add CXX flags support rather than use CFLAGS.

Browse Source
This commit is contained in:
Chris Johns 2014-07-25 21:45:01 +10:00
parent fa87409ff0
commit 712ef18988
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source-builder/defaults.mc
View File

@ -59,6 +59,7 @@ _uid: none, convert, '%(%{__id_u} -n)'
host_cflags: none, convert, '-O2 -pipe' host_cflags: 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_includes: none, convert, '' build_includes: none, convert, ''
# Extra path a platform can override. # Extra path a platform can override.
@ -191,12 +192,14 @@ SB_BUILD_DIR="%{_builddir}"
SB_HOST_CFLAGS="%{host_cflags} %{host_includes}" SB_HOST_CFLAGS="%{host_cflags} %{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_LDFLAGS="%{?build_ldflags:%{build_ldflags}}%{?_tmproot:-L%{_tmproot}/${SB_PREFIX_CLEAN}/lib}" SB_BUILD_LDFLAGS="%{?build_ldflags:%{build_ldflags}}%{?_tmproot:-L%{_tmproot}/${SB_PREFIX_CLEAN}/lib}"
SB_CFLAGS="${SB_BUILD_CFLAGS} %{build_includes}" SB_CFLAGS="${SB_BUILD_CFLAGS} %{build_includes}"
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_LDFLAGS SB_CFLAGS export SB_HOST_CFLAGS SB_HOST_LDFLAGS SB_BUILD_CFLAGS SB_BUILD_CXXFLAGS SB_BUILD_LDFLAGS SB_CFLAGS SB_CXXFLAGS
# Documentation # Documentation
SB_DOC_DIR="%{_docdir}" SB_DOC_DIR="%{_docdir}"
export SB_DOC_DIR export SB_DOC_DIR
@ -303,14 +306,15 @@ if test "%{_build}" != "%{_host}" ; then
CFLAGS="${SB_HOST_CFLAGS}" CFLAGS="${SB_HOST_CFLAGS}"
LDFLAGS="${SB_HOST_LDFLAGS}" LDFLAGS="${SB_HOST_LDFLAGS}"
CFLAGS_FOR_BUILD="${SB_BUILD_CFLAGS}" CFLAGS_FOR_BUILD="${SB_BUILD_CFLAGS}"
CXXFLAGS_FOR_BUILD="${SB_BUILD_CXXFLAGS}"
LDFLAGS_FOR_BUILD="${SB_BUILD_LDFLAGS}" LDFLAGS_FOR_BUILD="${SB_BUILD_LDFLAGS}"
CXXFLAGS_FOR_BUILD="${SB_BUILD_CFLAGS}" CXXFLAGS_FOR_BUILD="${SB_BUILD_CFLAGS}"
CC_FOR_BUILD=$(echo "%{__cc} ${SB_BUILD_CFLAGS}" | sed -e 's,-std=gnu99 ,,') CC_FOR_BUILD=$(echo "%{__cc} ${SB_BUILD_CFLAGS}" | sed -e 's,-std=gnu99 ,,')
CXX_FOR_BUILD=$(echo "%{__cxx} ${SB_BUILD_CFLAGS}" | sed -e 's,-std=gnu99 ,,') CXX_FOR_BUILD=$(echo "%{__cxx} ${SB_BUILD_CXXFLAGS}" | sed -e 's,-std=gnu99 ,,')
else else
LDFLAGS="${SB_BUILD_LDFLAGS}" LDFLAGS="${SB_BUILD_LDFLAGS}"
CC=$(echo "%{__cc} ${SB_BUILD_CFLAGS}" | sed -e 's,-std=gnu99 ,,') CC=$(echo "%{__cc} ${SB_BUILD_CFLAGS}" | sed -e 's,-std=gnu99 ,,')
CXX=$(echo "%{__cxx} ${SB_BUILD_CFLAGS}" | sed -e 's,-std=gnu99 ,,') CXX=$(echo "%{__cxx} ${SB_BUILD_CXXFLAGS}" | sed -e 's,-std=gnu99 ,,')
CC_FOR_BUILD=${CC} CC_FOR_BUILD=${CC}
CXX_FOR_BUILD=${CXX} CXX_FOR_BUILD=${CXX}
fi fi
@ -322,7 +326,7 @@ build_build_flags: none, none, '''
# gcc is not ready to be compiled with -std=gnu99 # gcc is not ready to be compiled with -std=gnu99
LDFLAGS="${SB_HOST_LDFLAGS}" LDFLAGS="${SB_HOST_LDFLAGS}"
CC=$(echo "%{__cc} ${SB_CFLAGS}" | sed -e 's,-std=gnu99 ,,') CC=$(echo "%{__cc} ${SB_CFLAGS}" | sed -e 's,-std=gnu99 ,,')
CXX=$(echo "%{__cxx} ${SB_CFLAGS}" | sed -e 's,-std=gnu99 ,,') CXX=$(echo "%{__cxx} ${SB_CXXFLAGS}" | sed -e 's,-std=gnu99 ,,')
CC_FOR_BUILD=${CC} CC_FOR_BUILD=${CC}
CXX_FOR_BUILD=${CXX} CXX_FOR_BUILD=${CXX}
export CC CXX CC_FOR_BUILD CXX_FOR_BUILD CFLAGS LDFLAGS''' export CC CXX CC_FOR_BUILD CXX_FOR_BUILD CFLAGS LDFLAGS'''

2
source-builder/sb/darwin.py
View File

@ -64,6 +64,8 @@ def load():
if int(version) >= 13: if int(version) >= 13:
defines['__cc'] = ('exe', 'required', '/usr/bin/cc') defines['__cc'] = ('exe', 'required', '/usr/bin/cc')
defines['__cxx'] = ('exe', 'required', '/usr/bin/c++') defines['__cxx'] = ('exe', 'required', '/usr/bin/c++')
defines['build_cflags'] = '-O2 -pipe -fbracket-depth=1024'
defines['build_cxxflags'] = '-O2 -pipe -fbracket-depth=1024'
defines['_build'] = defines['_host'] defines['_build'] = defines['_host']
defines['_build_vendor'] = defines['_host_vendor'] defines['_build_vendor'] = defines['_host_vendor']

1
source-builder/sb/freebsd.py
View File

@ -97,6 +97,7 @@ def load():
if check.check_exe(cxx, cxx): if check.check_exe(cxx, cxx):
raise error.general('no valid c++ not found') raise error.general('no valid c++ not found')
defines['build_cflags'] = '-O2 -pipe -fbracket-depth=1024' defines['build_cflags'] = '-O2 -pipe -fbracket-depth=1024'
defines['build_cxxflags'] = '-O2 -pipe -fbracket-depth=1024'
cvs = 'cvs' cvs = 'cvs'
if check.check_exe(cvs, cvs): if check.check_exe(cvs, cvs):
defines['__cvs'] = cvs defines['__cvs'] = cvs