scons: Do not build svga if using Solaris Studio C compiler.
Solaris Studio C compiler does not support anonymous structs and anonymous unions. Signed-off-by: Vinson Lee <vlee@freedesktop.org> Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
@@ -139,6 +139,7 @@ def generate(env):
|
|||||||
|
|
||||||
env['gcc'] = 'gcc' in os.path.basename(env['CC']).split('-')
|
env['gcc'] = 'gcc' in os.path.basename(env['CC']).split('-')
|
||||||
env['msvc'] = env['CC'] == 'cl'
|
env['msvc'] = env['CC'] == 'cl'
|
||||||
|
env['suncc'] = env['platform'] == 'sunos' and os.path.basename(env['CC']) == 'cc'
|
||||||
|
|
||||||
if env['msvc'] and env['toolchain'] == 'default' and env['machine'] == 'x86_64':
|
if env['msvc'] and env['toolchain'] == 'default' and env['machine'] == 'x86_64':
|
||||||
# MSVC x64 support is broken in earlier versions of scons
|
# MSVC x64 support is broken in earlier versions of scons
|
||||||
@@ -151,6 +152,7 @@ def generate(env):
|
|||||||
ppc = env['machine'] == 'ppc'
|
ppc = env['machine'] == 'ppc'
|
||||||
gcc = env['gcc']
|
gcc = env['gcc']
|
||||||
msvc = env['msvc']
|
msvc = env['msvc']
|
||||||
|
suncc = env['suncc']
|
||||||
|
|
||||||
# Determine whether we are cross compiling; in particular, whether we need
|
# Determine whether we are cross compiling; in particular, whether we need
|
||||||
# to compile code generators with a different compiler as the target code.
|
# to compile code generators with a different compiler as the target code.
|
||||||
|
@@ -2,6 +2,10 @@ Import('*')
|
|||||||
|
|
||||||
env = env.Clone()
|
env = env.Clone()
|
||||||
|
|
||||||
|
if env['suncc']:
|
||||||
|
print 'warning: not building svga'
|
||||||
|
Return()
|
||||||
|
|
||||||
if env['platform'] in ['linux']:
|
if env['platform'] in ['linux']:
|
||||||
env.Append(CCFLAGS = ['-fvisibility=hidden'])
|
env.Append(CCFLAGS = ['-fvisibility=hidden'])
|
||||||
|
|
||||||
|
@@ -2,6 +2,10 @@ Import('*')
|
|||||||
|
|
||||||
env = drienv.Clone()
|
env = drienv.Clone()
|
||||||
|
|
||||||
|
if env['suncc']:
|
||||||
|
print 'warning: not building dri-vmwgfx'
|
||||||
|
Return()
|
||||||
|
|
||||||
if env['build'] == 'release':
|
if env['build'] == 'release':
|
||||||
env.Append(CPPDEFINES = ['GALLIUM_RBUG'])
|
env.Append(CPPDEFINES = ['GALLIUM_RBUG'])
|
||||||
env.Prepend(LIBS = [rbug])
|
env.Prepend(LIBS = [rbug])
|
||||||
|
Reference in New Issue
Block a user