diff options
| author | Vinson Lee <[email protected]> | 2011-03-08 17:59:57 -0800 |
|---|---|---|
| committer | Vinson Lee <[email protected]> | 2011-03-08 17:59:57 -0800 |
| commit | c0d3fb4b6c11fd128921c464f753480a137555a0 (patch) | |
| tree | 1bc05c1790e71b33a63611a3c0afc58e1333001b | |
| parent | 67f61199c24276e6032774d56d2843c62fe28a2f (diff) | |
scons: Fix immediate Python exceptions with SCons on SunOS.
The build still fails.
| -rw-r--r-- | common.py | 2 | ||||
| -rw-r--r-- | src/gallium/tests/graw/SConscript | 2 | ||||
| -rw-r--r-- | src/gallium/tests/unit/SConscript | 2 | ||||
| -rw-r--r-- | src/gallium/winsys/sw/dri/SConscript | 2 | ||||
| -rw-r--r-- | src/gallium/winsys/sw/xlib/SConscript | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/common.py b/common.py index 1d0c6a71fa5..0a3dcdcf543 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 565fa5279cd..ad44d54c855 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 655e8a9b41c..49f28c03691 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 b255d725f95..f8e1fa6cfd8 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 df01a9ec2bf..e9c274059bd 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() |