Commit c0d3fb4b authored by Vinson Lee's avatar Vinson Lee

scons: Fix immediate Python exceptions with SCons on SunOS.

The build still fails.
parent 67f61199
...@@ -83,7 +83,7 @@ def AddOptions(opts): ...@@ -83,7 +83,7 @@ def AddOptions(opts):
opts.Add(EnumOption('machine', 'use machine-specific assembly code', default_machine, opts.Add(EnumOption('machine', 'use machine-specific assembly code', default_machine,
allowed_values=('generic', 'ppc', 'x86', 'x86_64'))) allowed_values=('generic', 'ppc', 'x86', 'x86_64')))
opts.Add(EnumOption('platform', 'target platform', host_platform, 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('toolchain', 'compiler toolchain', default_toolchain)
opts.Add(BoolOption('gles', 'EXPERIMENTAL: enable OpenGL ES support', 'no')) opts.Add(BoolOption('gles', 'EXPERIMENTAL: enable OpenGL ES support', 'no'))
opts.Add(BoolOption('llvm', 'use LLVM', default_llvm)) opts.Add(BoolOption('llvm', 'use LLVM', default_llvm))
......
...@@ -8,7 +8,7 @@ env.Prepend(LIBPATH = [graw.dir]) ...@@ -8,7 +8,7 @@ env.Prepend(LIBPATH = [graw.dir])
env.Prepend(LIBS = ['graw']) env.Prepend(LIBS = ['graw'])
if env['platform'] in ('freebsd8', 'sunos5'): if env['platform'] in ('freebsd8', 'sunos'):
env.Append(LIBS = ['m']) env.Append(LIBS = ['m'])
if env['platform'] == 'freebsd8': if env['platform'] == 'freebsd8':
......
...@@ -4,7 +4,7 @@ env = env.Clone() ...@@ -4,7 +4,7 @@ env = env.Clone()
env.Prepend(LIBS = [gallium]) env.Prepend(LIBS = [gallium])
if env['platform'] in ('freebsd8', 'sunos5'): if env['platform'] in ('freebsd8', 'sunos'):
env.Append(LIBS = ['m']) env.Append(LIBS = ['m'])
if env['platform'] == 'freebsd8': if env['platform'] == 'freebsd8':
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
Import('*') Import('*')
if env['platform'] == 'linux': if env['platform'] in ('linux', 'sunos'):
env = env.Clone() env = env.Clone()
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
Import('*') Import('*')
if env['platform'] in ('cygwin', 'linux'): if env['platform'] in ('cygwin', 'linux', 'sunos'):
env = env.Clone() env = env.Clone()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment