merge with upstream SConstruct, reuse shared objects

diff --git a/SConstruct b/SConstruct
index 00fe9493c1d3fe990926ed0e4d31ccea35a45865..d8f703504fe4918780dff37224c619f66011c44b 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -1,3 +1,4 @@
+# vim:ft=python
 import os
 
 double_conversion_sources = ['src/' + x for x in SConscript('src/SConscript')]
@@ -10,12 +11,12 @@ prefix = ARGUMENTS.get('prefix', '/usr/local')
 lib = ARGUMENTS.get('libsuffix', 'lib')
 libdir = os.path.join(DESTDIR + prefix, lib)
 
-env = Environment(CPPPATH='#/src')
+env = Environment(CPPPATH='#/src', LIBS=['m', 'stdc++'])
 debug = ARGUMENTS.get('debug', 0)
 optimize = ARGUMENTS.get('optimize', 0)
 env.Replace(CXX = ARGUMENTS.get('CXX', 'g++'))
 
-CCFLAGS = ['-fPIC']
+CCFLAGS = []
 if int(debug):
   CCFLAGS.append(ARGUMENTS.get('CXXFLAGS', '-g -Wall -Werror'))
 if int(optimize):
@@ -34,7 +35,7 @@ library_name = 'double_conversion'
 
 static_lib = env.StaticLibrary(library_name, double_conversion_static_objects)
 static_lib_pic = env.StaticLibrary(library_name + '_pic', double_conversion_shared_objects)
-shared_lib = env.SharedLibrary(library_name, double_conversion_sources)
+shared_lib = env.SharedLibrary(library_name, double_conversion_shared_objects)
 
 env.Program('run_tests', double_conversion_test_sources, LIBS=[static_lib])