From 9549e55f1108540b513dfdb8277655a9f367c5f8 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Thu, 27 Sep 2012 23:21:09 -0700 Subject: [PATCH] scons: Disable build of assembly sources on Cygwin. The assembly sources currently do not build on Cygwin. Signed-off-by: Vinson Lee Reviewed-by: Brian Paul --- 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 ad007a6f436..c336c2510ee 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 dba75a26448..9819082177f 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', -- 2.30.2