From eb1780238621c7be0342d9129eb639e4892c004d Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Thu, 24 Feb 2011 19:49:37 -0800 Subject: scons: Reduce all Cygwin platform names to 'cygwin'. platform.system in SCons on Cygwin includes the OS version number. Windows XP - CYGWIN_NT-5.1 Windows Vista - CYGWIN_NT-6.0 Windows 7 - CYGWIN_NT-6.1 Reduce all Cygwin platform variants to just 'cygwin' so anything downstream can simply use 'cygwin' instead of the different full platform names. --- scons/gallium.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'scons') diff --git a/scons/gallium.py b/scons/gallium.py index 9118257ac0..112f6c89dc 100755 --- a/scons/gallium.py +++ b/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', -- cgit v1.2.3