aboutsummaryrefslogtreecommitdiff
path: root/mesalib/scons
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-02-25 08:27:07 +0000
committermarha <marha@users.sourceforge.net>2011-02-25 08:27:07 +0000
commit27b0ed125725f09242054563bb65ac20cfaa17ff (patch)
tree6fe92374761ae87d8541d117605db27f3486aee1 /mesalib/scons
parente8d899178e9ebe174e6b4a53297d3dfced8003f0 (diff)
parent8268836508edd4ba2a3045c9ba937397df7bf2c5 (diff)
downloadvcxsrv-27b0ed125725f09242054563bb65ac20cfaa17ff.tar.gz
vcxsrv-27b0ed125725f09242054563bb65ac20cfaa17ff.tar.bz2
vcxsrv-27b0ed125725f09242054563bb65ac20cfaa17ff.zip
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/scons')
-rw-r--r--mesalib/scons/gallium.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/mesalib/scons/gallium.py b/mesalib/scons/gallium.py
index 46df7a899..c9c8856b2 100644
--- a/mesalib/scons/gallium.py
+++ b/mesalib/scons/gallium.py
@@ -195,6 +195,8 @@ def generate(env):
# Determine whether we are cross compiling; in particular, whether we need
# to compile code generators with a different compiler as the target code.
host_platform = _platform.system().lower()
+ if host_platform.startswith('cygwin'):
+ host_platform = 'cygwin'
host_machine = os.environ.get('PROCESSOR_ARCHITEW6432', os.environ.get('PROCESSOR_ARCHITECTURE', _platform.machine()))
host_machine = {
'x86': 'x86',