1 files changed, 2 insertions, 0 deletions
diff --git a/scons/gallium.py b/scons/gallium.py
index 5103b924855..dc77904f06d 100755
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -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']