Index: head/devel/rlvm/files/patch-SConstruct =================================================================== --- head/devel/rlvm/files/patch-SConstruct (revision 427073) +++ head/devel/rlvm/files/patch-SConstruct (revision 427074) @@ -1,38 +1,46 @@ --- SConstruct~ +++ SConstruct @@ -19,7 +19,12 @@ AddOption('--fullstatic', action='store_ # Set libraries used by all configurations and all binaries in rlvm. env = Environment( + ENV=os.environ, tools = ["default", "rlvm"], + **dict((k, v.split()) for k, v in ARGUMENTS.iteritems()) +) + +env.Append( LIBS = ["z"], +@@ -278,6 +275,7 @@ if not config.CheckGuichan(): + # Get the configuration from sdl and freetype + env.ParseConfig("sdl-config --cflags") + env.ParseConfig("freetype-config --cflags --libs") ++config.CheckLibWithHeader('intl', 'libintl.h', "cpp") + + env = config.Finish() + @@ -314,7 +311,6 @@ if GetOption('release'): # Now add release optimizations to the environment env.Append( CPPFLAGS = [ - "-Os", "-DNDEBUG", "-DBOOST_DISABLE_ASSERTS" ] @@ -360,13 +356,7 @@ elif GetOption('pprof'): "profiler"] ) else: - # Add debugging flags to all binaries here - env.Append( - CPPFLAGS = [ - "-g", - "-O0" - ] - ) + pass # Cross platform core of rlvm. Produces librlvm.a and libsystem_sdl.a env.SConscript("SConscript",