use our CXX/CXXFLAGS

diff --git a/SConstruct b/SConstruct
index 44ab44ad39953b36856e6b05c226e862ecb1037f..beecee9ebba1f2489cf0b9dfadabef5282028d3f 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -5,10 +5,12 @@ print(test)
 env = Environment(CPPPATH='#/src')
 debug = ARGUMENTS.get('debug', 0)
 optimize = ARGUMENTS.get('optimize', 0)
+env.Replace(CXX = ARGUMENTS.get('CXX', 'g++'))
+
 if int(debug):
   env.Append(CCFLAGS = '-g -Wall -Werror')
 if int(optimize):
-  env.Append(CCFLAGS = '-O3')
+  env.Append(CCFLAGS = ARGUMENTS.get('CXXFLAGS', '-O3'))
 print double_conversion_sources
 print double_conversion_test_sources
 double_conversion_shared_objects = [

diff --git a/double-conversion.spec b/double-conversion.spec
index 7d6f5716b2d46d5287389f1040279b8e9f13eb62..8646d97f34c1fbe5498568100cf0f7382eb90fec 100644 (file)
--- a/double-conversion.spec
+++ b/double-conversion.spec
@@ -34,9 +34,13 @@ examples can be found in test/cctest/test-conversions.cc.
 
 %prep
 %setup -q -n %{name}
+cp -p %{SOURCE1} SConstruct
 
 %build
-%scons -f %{SOURCE1}
+%scons \
+       optimize=1 \
+       CXX="%{__cxx}"
+       CXXFLAGS="%{__cxx}"
 
 %install
 rm -rf $RPM_BUILD_ROOT