scons: Don't use gstabs on mingw-64.

diff --git a/scons/crossmingw.py b/scons/crossmingw.py
index 893002f64a99c157aaa1904884e4eb9592f29351..23c56c0a2da573141a61b8756d47ee402fa92f53 100644 (file)
--- a/scons/crossmingw.py
+++ b/scons/crossmingw.py
@@ -221,9 +221,11 @@ def generate(env):
     env['LIBPREFIXES']    = [ 'lib', '' ]
     env['LIBSUFFIXES']    = [ '.a', '.lib' ]
 
-    # MinGW port of gdb does not handle well dwarf debug info which is the
-    # default in recent gcc versions
-    env.AppendUnique(CCFLAGS = ['-gstabs'])
+    # MinGW x86 port of gdb does not handle well dwarf debug info which is the
+    # default in recent gcc versions.  The x64 port gdb from mingw-w64 seems to
+    # handle it fine though, so stick with the default there.
+    if env['machine'] != 'x86_64':
+        env.AppendUnique(CCFLAGS = ['-gstabs'])
 
     env.AddMethod(compile_without_gstabs, 'compile_without_gstabs')