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

Author: José Fonseca <[email protected]>
Date:   Thu Feb 12 12:59:58 2009 +0000

scons: Unbreak mingw builds.
(cherry picked from commit 6fe421cf4634033bc7e75375e1d981bd235e2e51)

---

 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 e837e97..73f9035 100644
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -421,7 +421,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 6662342..67ec767 100644
--- a/scons/generic.py
+++ b/scons/generic.py
@@ -490,7 +490,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 += [

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to