[Mesa-dev] [PATCH] scons: Do not build svga if using Solaris Studio C compiler.

[Brian Paul]

On 06/17/2012 11:18 AM, Vinson Lee wrote:
> Solaris Studio C compiler does not support anonymous structs and
> anonymous unions.
>
> Signed-off-by: Vinson Lee<vlee at freedesktop.org>
> ---
>   scons/gallium.py                          |    2 ++
>   src/gallium/drivers/svga/SConscript       |    4 ++++
>   src/gallium/targets/dri-vmwgfx/SConscript |    4 ++++
>   3 files changed, 10 insertions(+), 0 deletions(-)
>
> diff --git a/scons/gallium.py b/scons/gallium.py
> index ee91ca4..75c713d 100755
> --- a/scons/gallium.py
> +++ b/scons/gallium.py
> @@ -139,6 +139,7 @@ def generate(env):
>
>       env['gcc'] = 'gcc' in os.path.basename(env['CC']).split('-')
>       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':
>           # MSVC x64 support is broken in earlier versions of scons
> @@ -151,6 +152,7 @@ def generate(env):
>       ppc = env['machine'] == 'ppc'
>       gcc = env['gcc']
>       msvc = env['msvc']
> +    suncc = env['suncc']
>
>       # Determine whether we are cross compiling; in particular, whether we need
>       # to compile code generators with a different compiler as the target code.
> diff --git a/src/gallium/drivers/svga/SConscript b/src/gallium/drivers/svga/SConscript
> index 87903d8..8ffeed5 100644
> --- a/src/gallium/drivers/svga/SConscript
> +++ b/src/gallium/drivers/svga/SConscript
> @@ -2,6 +2,10 @@ Import('*')
>
>   env = env.Clone()
>
> +if env['suncc']:
> +	print 'warning: not building svga'
> +	Return()
> +
>   if env['platform'] in ['linux']:
>   	env.Append(CCFLAGS = ['-fvisibility=hidden'])
>
> diff --git a/src/gallium/targets/dri-vmwgfx/SConscript b/src/gallium/targets/dri-vmwgfx/SConscript
> index e758b49..0d19944 100644
> --- a/src/gallium/targets/dri-vmwgfx/SConscript
> +++ b/src/gallium/targets/dri-vmwgfx/SConscript
> @@ -2,6 +2,10 @@ Import('*')
>
>   env = drienv.Clone()
>
> +if env['suncc']:
> +    print 'warning: not building dri-vmwgfx'
> +    Return()
> +
>   if env['build'] == 'release':
>       env.Append(CPPDEFINES = ['GALLIUM_RBUG'])
>       env.Prepend(LIBS = [rbug])

Looks OK to me.

Reviewed-by: Brian Paul <brianp at vmware.com>