intel: Remove the pbo zero-copy code.

[mesa.git] / scons / gallium.py

diff --git a/scons/gallium.py b/scons/gallium.py
index 5103b9248551aba126b9c0012dc52d1d00006f21..1c9c0ea32e46613dcc13f1e3dbc9666fdbfa774d 100755 (executable)
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -363,7 +363,7 @@ def generate(env):
             ccflags += ['-O3']
         # Work around aliasing bugs - developers should comment this out
         ccflags += ['-fno-strict-aliasing']
-        ccflags += ['-g3']
+        ccflags += ['-g']
         if env['build'] in ('checked', 'profile'):
             # See http://code.google.com/p/jrfonseca/wiki/Gprof2Dot#Which_options_should_I_pass_to_gcc_when_compiling_for_profiling?
             ccflags += [
@@ -537,6 +537,8 @@ def generate(env):
         if env['platform'] == 'windows':
             # Avoid depending on gcc runtime DLLs
             linkflags += ['-static-libgcc']
+            if env['machine'] == 'x86_64':
+                linkflags += ['-static-libstdc++']
             # Handle the @xx symbol munging of DLL exports
             shlinkflags += ['-Wl,--enable-stdcall-fixup']
             #shlinkflags += ['-Wl,--kill-at']