diff options
| -rw-r--r-- | scons/crossmingw.py | 8 | ||||
| -rwxr-xr-x | scons/gallium.py | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/scons/crossmingw.py b/scons/crossmingw.py index 949fc4fb1dc..893002f64a9 100644 --- a/scons/crossmingw.py +++ b/scons/crossmingw.py @@ -225,14 +225,6 @@ def generate(env): # default in recent gcc versions env.AppendUnique(CCFLAGS = ['-gstabs']) - env.AppendUnique(CPPDEFINES = [('__MSVCRT_VERSION__', '0x0700')]) - #env.AppendUnique(LIBS = ['iberty']) - env.AppendUnique(SHLINKFLAGS = ['-Wl,--enable-stdcall-fixup']) - #env.AppendUnique(SHLINKFLAGS = ['-Wl,--kill-at']) - - # Avoid depending on gcc runtime DLLs - env.AppendUnique(LINKFLAGS = ['-static-libgcc']) - env.AddMethod(compile_without_gstabs, 'compile_without_gstabs') def exists(env): diff --git a/scons/gallium.py b/scons/gallium.py index 7135251d7a3..5103b924855 100755 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -279,6 +279,8 @@ def generate(env): ('_WIN32_WINNT', '0x0601'), ('WINVER', '0x0601'), ] + if gcc: + cppdefines += [('__MSVCRT_VERSION__', '0x0700')] if msvc and env['toolchain'] != 'winddk': cppdefines += [ 'VC_EXTRALEAN', @@ -532,6 +534,12 @@ def generate(env): pass else: env['_LIBFLAGS'] = '-Wl,--start-group ' + env['_LIBFLAGS'] + ' -Wl,--end-group' + if env['platform'] == 'windows': + # Avoid depending on gcc runtime DLLs + linkflags += ['-static-libgcc'] + # Handle the @xx symbol munging of DLL exports + shlinkflags += ['-Wl,--enable-stdcall-fixup'] + #shlinkflags += ['-Wl,--kill-at'] if msvc: if env['build'] == 'release': # enable Link-time Code Generation |