From: Vinson Lee <vlee@freedesktop.org>
Date: Sun, 19 Feb 2012 07:43:03 +0000 (-0800)
Subject: scons: Don't build the assembly sources on Mac OS X.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c5e646002291fdc372dc5db507c71017ec0c0e70;p=mesa.git

scons: Don't build the assembly sources on Mac OS X.

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 <vlee@freedesktop.org>
Reviewed-by: José Fonseca <jfonseca@vmware.com>
---

diff --git a/src/mapi/glapi/SConscript b/src/mapi/glapi/SConscript
index 9882806ce60..4097a7fe138 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 e9b1f6aaf2f..10a04689df5 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',