From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Sun, 6 Jan 2013 22:06:37 +0000 (-0600)
Subject: mesa: Don't use rtasm for Haiku swrast
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b9227b3e15d8e8d4e6e96efbad940a32c0853c19;p=mesa.git

mesa: Don't use rtasm for Haiku swrast

* We have a symbol conflict as rtasm in
  Mesa collides with rtasm in gallium.
* As us linking gallium and mesa together
  is an edge case, lets just omit the rtasm
  code from Mesa as we should be going
  llvmpipe soon :)
---

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index a2492f7716f..a28db23e45a 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -370,7 +370,7 @@ env.Depends(glget_sources, get_hash_header)
 #
 # Assembly sources
 #
-if env['gcc'] and env['platform'] not in ('cygwin', 'darwin', 'windows'):
+if env['gcc'] and env['platform'] not in ('cygwin', 'darwin', 'windows', 'haiku'):
     if env['machine'] == 'x86':
         env.Append(CPPDEFINES = [
             'USE_X86_ASM',