Mesa (gallium-0.1): scons: Use .a suffix for MinGW.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Tue Sep 1 09:57:10 UTC 2009


Module: Mesa
Branch: gallium-0.1
Commit: 9c16c101ea6a606ce70fa22a7591c25e85e1ea97
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9c16c101ea6a606ce70fa22a7591c25e85e1ea97

Author: José Fonseca <jfonseca at vmware.com>
Date:   Wed Jan 14 11:36:02 2009 +0000

scons: Use .a suffix for MinGW.

This allows to build MinGW and MSVC within the same dir.
(cherry picked from commit 83155aa11f1b12982ba501a495d8ccb15dc9b92e)

---

 scons/crossmingw.py |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/scons/crossmingw.py b/scons/crossmingw.py
index cf4887b..b1141c9 100644
--- a/scons/crossmingw.py
+++ b/scons/crossmingw.py
@@ -162,18 +162,16 @@ def generate(env):
     # Some setting from the platform also have to be overridden:
     env['OBJPREFIX']      = ''
     env['OBJSUFFIX']      = '.o'
-    env['LIBPREFIX']      = 'lib'
-    env['LIBSUFFIX']      = '.a'
     env['SHOBJPREFIX']    = '$OBJPREFIX'
     env['SHOBJSUFFIX']    = '$OBJSUFFIX'
     env['PROGPREFIX']     = ''
     env['PROGSUFFIX']     = '.exe'
-    env['LIBPREFIX']      = ''
-    env['LIBSUFFIX']      = '.lib'
+    env['LIBPREFIX']      = 'lib'
+    env['LIBSUFFIX']      = '.a'
     env['SHLIBPREFIX']    = ''
     env['SHLIBSUFFIX']    = '.dll'
-    env['LIBPREFIXES']    = [ '$LIBPREFIX' ]
-    env['LIBSUFFIXES']    = [ '$LIBSUFFIX' ]
+    env['LIBPREFIXES']    = [ 'lib', '' ]
+    env['LIBSUFFIXES']    = [ '.a', '.lib' ]
 
     env.AppendUnique(LIBS = ['iberty'])
     env.AppendUnique(LINKFLAGS = ['-Wl,--enable-stdcall-fixup'])




More information about the mesa-commit mailing list