summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVinson Lee <[email protected]>2012-02-18 23:43:03 -0800
committerVinson Lee <[email protected]>2012-02-25 00:25:43 -0800
commitc5e646002291fdc372dc5db507c71017ec0c0e70 (patch)
tree3c1ceed233a6c451b8904b3b56938ebc9dad5480 /src
parent6512bc4e67f0f2b53805d050e11f6a336b505f40 (diff)
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 <[email protected]> Reviewed-by: José Fonseca <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/mapi/glapi/SConscript2
-rw-r--r--src/mesa/SConscript2
2 files changed, 2 insertions, 2 deletions
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',