[packages/double-conversion] use our CXX/CXXFLAGS

glen glen at pld-linux.org
Sat Oct 5 23:09:15 CEST 2013


commit 3a886c7c1ab4fb00bf20cdfdf248ed2b9a23569d
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Oct 6 00:09:05 2013 +0300

    use our CXX/CXXFLAGS

 SConstruct             | 4 +++-
 double-conversion.spec | 6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/double-conversion.spec b/double-conversion.spec
index 7d6f571..8646d97 100644
--- 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
diff --git a/SConstruct b/SConstruct
index 44ab44a..beecee9 100644
--- 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 = [
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/double-conversion.git/commitdiff/3a886c7c1ab4fb00bf20cdfdf248ed2b9a23569d



More information about the pld-cvs-commit mailing list