[Mesa-dev] Mesa (master): scons: Fix Cygwin platform names.

[Jose Fonseca]

Vinson,

I'd prefer that we map all these cygwin-xxx variants to the same cygwin value, instead of having to guess which one works. Just like we normalize system's machine from AMD64/x86_64/x64 to x86_64, and only use the latter.

Jose

________________________________________
From: mesa-commit-bounces+jfonseca=vmware.com at lists.freedesktop.org [mesa-commit-bounces+jfonseca=vmware.com at lists.freedesktop.org] On Behalf Of Vinson Lee [vlee at kemper.freedesktop.org]
Sent: Thursday, February 24, 2011 2:22
To: mesa-commit at lists.freedesktop.org
Subject: Mesa (master): scons: Fix Cygwin platform names.

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

Author: Vinson Lee <vlee at vmware.com>
Date:   Wed Feb 23 18:21:14 2011 -0800

scons: Fix Cygwin platform names.

Fixes immediate Python exceptions with SCons on Cygwin.

---

 common.py                             |    2 +-
 src/gallium/winsys/sw/xlib/SConscript |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common.py b/common.py
index b74b204..b44f20e 100644
--- a/common.py
+++ b/common.py
@@ -81,7 +81,7 @@ def AddOptions(opts):
        opts.Add(EnumOption('machine', 'use machine-specific assembly code', default_machine,
                                                                                         allowed_values=('generic', 'ppc', 'x86', 'x86_64')))
        opts.Add(EnumOption('platform', 'target platform', host_platform,
-                                                                                        allowed_values=('linux', 'cell', 'windows', 'winddk', 'wince', 'darwin', 'embedded', 'cygwin', 'sunos5', 'freebsd8')))
+                                                                                        allowed_values=('linux', 'cell', 'windows', 'winddk', 'wince', 'darwin', 'embedded', 'cygwin_nt-5.1', 'cygwin_nt-6.1', 'sunos5', 'freebsd8')))
        opts.Add('toolchain', 'compiler toolchain', default_toolchain)
        opts.Add(BoolOption('gles', 'EXPERIMENTAL: enable OpenGL ES support', 'no'))
        opts.Add(BoolOption('llvm', 'use LLVM', default_llvm))
diff --git a/src/gallium/winsys/sw/xlib/SConscript b/src/gallium/winsys/sw/xlib/SConscript
index df01a9e..f6c4741 100644
--- a/src/gallium/winsys/sw/xlib/SConscript
+++ b/src/gallium/winsys/sw/xlib/SConscript
@@ -4,7 +4,7 @@

 Import('*')

-if env['platform'] in ('cygwin', 'linux'):
+if env['platform'] in ('cygwin_nt-5.1', 'cygwin_nt-6.1', 'linux'):

     env = env.Clone()


_______________________________________________
mesa-commit mailing list
mesa-commit at lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit