Mesa (master): mesa: Don't use rtasm for Haiku swrast

[Alexander von Gluck IV]

Module: Mesa
Branch: master
Commit: b9227b3e15d8e8d4e6e96efbad940a32c0853c19
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b9227b3e15d8e8d4e6e96efbad940a32c0853c19

Author: Alexander von Gluck IV <kallisti5 at unixzen.com>
Date:   Sun Jan  6 16:06:37 2013 -0600

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 :)

---

 src/mesa/SConscript |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index a2492f7..a28db23 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',