Mesa (master): scons: Unbreak mingw builds.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Thu Feb 12 13:14:06 UTC 2009


Module: Mesa
Branch: master
Commit: 6fe421cf4634033bc7e75375e1d981bd235e2e51
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6fe421cf4634033bc7e75375e1d981bd235e2e51

Author: José Fonseca <jfonseca at vmware.com>
Date:   Thu Feb 12 12:59:58 2009 +0000

scons: Unbreak mingw builds.

---

 scons/gallium.py |    2 +-
 scons/generic.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scons/gallium.py b/scons/gallium.py
index 3fbac76..d20d02c 100644
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -438,7 +438,7 @@ def generate(env):
             linkflags += ['-m32']
         if env['machine'] == 'x86_64':
             linkflags += ['-m64']
-    if platform == 'windows':
+    if platform == 'windows' and msvc:
         # See also:
         # - http://msdn2.microsoft.com/en-us/library/y0zzbyt4.aspx
         linkflags += [
diff --git a/scons/generic.py b/scons/generic.py
index 31a4a79..7592222 100644
--- a/scons/generic.py
+++ b/scons/generic.py
@@ -517,7 +517,7 @@ def generate(env):
             linkflags += ['-m32']
         if env['machine'] == 'x86_64':
             linkflags += ['-m64']
-    if platform == 'windows':
+    if platform == 'windows' and msvc:
         # See also:
         # - http://msdn2.microsoft.com/en-us/library/y0zzbyt4.aspx
         linkflags += [




More information about the mesa-commit mailing list