--- SConstruct.mozjs185~ 2011-03-16 16:33:30.000000000 +0100 +++ SConstruct 2011-04-02 01:08:47.614488261 +0200 @@ -688,13 +687,20 @@ if nix: env.Append( CPPFLAGS=" -O0 -fstack-protector " ); env['ENV']['GLIBCXX_FORCE_NEW'] = 1; # play nice with valgrind else: - env.Append( CPPFLAGS=" -O3" ) + env.Append( CPPFLAGS=" -O3 " ) #env.Append( CPPFLAGS=" -fprofile-generate" ) #env.Append( LINKFLAGS=" -fprofile-generate" ) # then: #env.Append( CPPFLAGS=" -fprofile-use" ) #env.Append( LINKFLAGS=" -fprofile-use" ) + if 'CXXFLAGS' in os.environ: + env.Append( CXXFLAGS=" " + os.environ['CXXFLAGS'] + " " ) + if 'CPPFLAGS' in os.environ: + env.Append( CPPFLAGS=" " + os.environ['CPPFLAGS'] + " " ) + if 'LINKFLAGS' in os.environ: + env.Append( LINKFLAGS=" " + os.environ['LINKFLAGS'] + " " ) + if debugLogging: env.Append( CPPFLAGS=" -D_DEBUG" );