From 712ef18988a41215653169fe4ca7a07dc08da211 Mon Sep 17 00:00:00 2001
From: Chris Johns <chrisj@rtems.org>
Date: Fri, 25 Jul 2014 21:45:01 +1000
Subject: [PATCH] sb: Add CXX flags support rather than use CFLAGS.

---
 source-builder/defaults.mc   | 12 ++++++++----
 source-builder/sb/darwin.py  |  2 ++
 source-builder/sb/freebsd.py |  1 +
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/source-builder/defaults.mc b/source-builder/defaults.mc
index 965ebf1..1dfa342 100644
--- a/source-builder/defaults.mc
+++ b/source-builder/defaults.mc
@@ -59,6 +59,7 @@ _uid:                none,    convert,  '%(%{__id_u} -n)'
 host_cflags:         none,    convert,  '-O2 -pipe'
 host_includes:       none,    convert,  ''
 build_cflags:        none,    convert,  '-O2 -pipe'
+build_cxxflags:      none,    convert,  '-O2 -pipe'
 build_includes:      none,    convert,  ''
 
 # Extra path a platform can override.
@@ -191,12 +192,14 @@ SB_BUILD_DIR="%{_builddir}"
 SB_HOST_CFLAGS="%{host_cflags} %{host_includes}"
 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_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_CFLAGS="${SB_BUILD_CFLAGS} %{build_includes}"
+SB_CXXFLAGS="${SB_BUILD_CXXFLAGS} %{build_includes}"
 SB_ARCH="%{_arch}"
 SB_OS="%{_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
 SB_DOC_DIR="%{_docdir}"
 export SB_DOC_DIR
@@ -303,14 +306,15 @@ if test "%{_build}" != "%{_host}" ; then
   CFLAGS="${SB_HOST_CFLAGS}"
   LDFLAGS="${SB_HOST_LDFLAGS}"
   CFLAGS_FOR_BUILD="${SB_BUILD_CFLAGS}"
+  CXXFLAGS_FOR_BUILD="${SB_BUILD_CXXFLAGS}"
   LDFLAGS_FOR_BUILD="${SB_BUILD_LDFLAGS}"
   CXXFLAGS_FOR_BUILD="${SB_BUILD_CFLAGS}"
   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
   LDFLAGS="${SB_BUILD_LDFLAGS}"
   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}
   CXX_FOR_BUILD=${CXX}
 fi
@@ -322,7 +326,7 @@ build_build_flags:    none,    none,     '''
 # gcc is not ready to be compiled with -std=gnu99
 LDFLAGS="${SB_HOST_LDFLAGS}"
 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}
 CXX_FOR_BUILD=${CXX}
 export CC CXX CC_FOR_BUILD CXX_FOR_BUILD CFLAGS LDFLAGS'''
diff --git a/source-builder/sb/darwin.py b/source-builder/sb/darwin.py
index bdeba6e..91438b7 100644
--- a/source-builder/sb/darwin.py
+++ b/source-builder/sb/darwin.py
@@ -64,6 +64,8 @@ def load():
         if int(version) >= 13:
             defines['__cc'] = ('exe',     'required', '/usr/bin/cc')
             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_vendor'] = defines['_host_vendor']
diff --git a/source-builder/sb/freebsd.py b/source-builder/sb/freebsd.py
index 626a2a8..7666b96 100644
--- a/source-builder/sb/freebsd.py
+++ b/source-builder/sb/freebsd.py
@@ -97,6 +97,7 @@ def load():
             if check.check_exe(cxx, cxx):
                 raise error.general('no valid c++ not found')
             defines['build_cflags'] = '-O2 -pipe -fbracket-depth=1024'
+            defines['build_cxxflags'] = '-O2 -pipe -fbracket-depth=1024'
         cvs = 'cvs'
         if check.check_exe(cvs, cvs):
             defines['__cvs'] = cvs