From c5e646002291fdc372dc5db507c71017ec0c0e70 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Sat, 18 Feb 2012 23:43:03 -0800 Subject: [PATCH] scons: Don't build the assembly sources on Mac OS X. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This patch allows the Mac OS X SCons build to complete. The assembly sources contain psuedo-ops that not are supported on Mac OS X. Signed-off-by: Vinson Lee Reviewed-by: José Fonseca --- 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 9882806..4097a7f 100644 --- a/src/mapi/glapi/SConscript +++ b/src/mapi/glapi/SConscript @@ -46,7 +46,7 @@ for s in mapi_sources: # # Assembly sources # -if env['gcc'] and env['platform'] != 'windows': +if env['gcc'] and env['platform'] not in ('darwin', 'windows'): if env['machine'] == 'x86': env.Append(CPPDEFINES = [ 'USE_X86_ASM', diff --git a/src/mesa/SConscript b/src/mesa/SConscript index e9b1f6a..10a0468 100644 --- a/src/mesa/SConscript +++ b/src/mesa/SConscript @@ -384,7 +384,7 @@ if env['gles']: # # Assembly sources # -if env['gcc'] and env['platform'] != 'windows': +if env['gcc'] and env['platform'] not in ('darwin', 'windows'): if env['machine'] == 'x86': env.Append(CPPDEFINES = [ 'USE_X86_ASM', -- 2.7.4