--- a/SConstruct 2013-06-26 10:31:56.209089504 +0200 +++ b/SConstruct 2013-06-26 10:33:59.177045991 +0200 @@ -702,7 +702,6 @@ # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used. env.Append( CCFLAGS=["-fPIC", "-fno-strict-aliasing", - "-ggdb", "-pthread", "-Wall", "-Wsign-compare", @@ -710,14 +709,14 @@ "-Winvalid-pch"] ) # env.Append( " -Wconversion" ) TODO: this doesn't really work yet if linux: - env.Append( CCFLAGS=["-Werror", "-pipe"] ) if not has_option('clang'): env.Append( CCFLAGS=["-fno-builtin-memcmp"] ) # glibc's memcmp is faster than gcc's env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] ) - env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] ) + env.Append( CXXFLAGS=os.environ['CXXFLAGS']) + env.Append( LINKFLAGS=os.environ['LDFLAGS'] ) env.Append( LINKFLAGS=["-fPIC", "-pthread", "-rdynamic"] ) - env.Append( LIBS=[] ) + env.Append( LIBS=['pcre', 'pcrecpp', 'snappy'] ) #make scons colorgcc friendly for key in ('HOME', 'TERM'):