[Mesa-dev] [PATCH] scons: Disable build of assembly sources on Cygwin.

[Brian Paul]

On 09/28/2012 12:35 AM, Vinson Lee wrote:
> The assembly sources currently do not build on Cygwin.
>
> Signed-off-by: Vinson Lee<vlee at freedesktop.org>
> ---
>   src/mapi/glapi/SConscript |    2 +-
>   src/mesa/SConscript       |    2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/mapi/glapi/SConscript b/src/mapi/glapi/SConscript
> index ad007a6..c336c25 100644
> --- a/src/mapi/glapi/SConscript
> +++ b/src/mapi/glapi/SConscript
> @@ -48,7 +48,7 @@ for s in mapi_sources:
>   #
>   # Assembly sources
>   #
> -if env['gcc'] and env['platform'] not in ('darwin', 'windows'):
> +if env['gcc'] and env['platform'] not in ('cygwin', 'darwin', 'windows'):
>       GLAPI = '#src/mapi/glapi/'
>
>       if env['machine'] == 'x86':
> diff --git a/src/mesa/SConscript b/src/mesa/SConscript
> index dba75a2..9819082 100644
> --- a/src/mesa/SConscript
> +++ b/src/mesa/SConscript
> @@ -371,7 +371,7 @@ if env['gles']:
>   #
>   # Assembly sources
>   #
> -if env['gcc'] and env['platform'] not in ('darwin', 'windows'):
> +if env['gcc'] and env['platform'] not in ('cygwin', 'darwin', 'windows'):
>       if env['machine'] == 'x86':
>           env.Append(CPPDEFINES = [
>               'USE_X86_ASM',

Looks OK to me.

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