scons: Fix immediate Python exceptions with SCons on SunOS.

The build still fails.

diff --git a/common.py b/common.py
index 1d0c6a71fa5419d538ffcdafa8a4f653339e4d76..0a3dcdcf54309995dbdcd5176a5080dab44604f3 100644 (file)
--- 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 565fa5279cdb575526fa536b76da919697d4dcc9..ad44d54c855d0cfa869cab7d116c38686be93491 100644 (file)
--- 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 655e8a9b41cbfefaf7d43cc093e792493042beae..49f28c036910baf351c64bc8c57a2a32c9300d51 100644 (file)
--- 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 b255d725f95262c8cad8f309f1dfa2cbfe84fe71..f8e1fa6cfd87171959d0e7e4e6ff4afe990d7a4e 100644 (file)
--- 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 df01a9ec2bfd0524afd9537fc14bcecaf499f4ea..e9c274059bd62ac790c4e904a96c6f6cc35375c6 100644 (file)
--- 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()