Mesa (master): scons: Fix immediate Python exceptions with SCons on SunOS.

[Vinson Lee]

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

Author: Vinson Lee <vlee at vmware.com>
Date:   Tue Mar  8 17:59:57 2011 -0800

scons: Fix immediate Python exceptions with SCons on SunOS.

The build still fails.

---

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

diff --git a/common.py b/common.py
index 1d0c6a7..0a3dcdc 100644
--- a/common.py
+++ b/common.py
@@ -83,7 +83,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', 'sunos', '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/tests/graw/SConscript b/src/gallium/tests/graw/SConscript
index 565fa52..ad44d54 100644
--- a/src/gallium/tests/graw/SConscript
+++ b/src/gallium/tests/graw/SConscript
@@ -8,7 +8,7 @@ env.Prepend(LIBPATH = [graw.dir])
 env.Prepend(LIBS = ['graw'])
     
 
-if env['platform'] in ('freebsd8', 'sunos5'):
+if env['platform'] in ('freebsd8', 'sunos'):
     env.Append(LIBS = ['m'])
 
 if env['platform'] == 'freebsd8':
diff --git a/src/gallium/tests/unit/SConscript b/src/gallium/tests/unit/SConscript
index 655e8a9..49f28c0 100644
--- a/src/gallium/tests/unit/SConscript
+++ b/src/gallium/tests/unit/SConscript
@@ -4,7 +4,7 @@ env = env.Clone()
 
 env.Prepend(LIBS = [gallium])
 
-if env['platform'] in ('freebsd8', 'sunos5'):
+if env['platform'] in ('freebsd8', 'sunos'):
     env.Append(LIBS = ['m'])
 
 if env['platform'] == 'freebsd8':
diff --git a/src/gallium/winsys/sw/dri/SConscript b/src/gallium/winsys/sw/dri/SConscript
index b255d72..f8e1fa6 100644
--- a/src/gallium/winsys/sw/dri/SConscript
+++ b/src/gallium/winsys/sw/dri/SConscript
@@ -4,7 +4,7 @@
 
 Import('*')
 
-if env['platform'] == 'linux':
+if env['platform'] in ('linux', 'sunos'):
 
     env = env.Clone()
 
diff --git a/src/gallium/winsys/sw/xlib/SConscript b/src/gallium/winsys/sw/xlib/SConscript
index df01a9e..e9c2740 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', 'linux', 'sunos'):
 
     env = env.Clone()