Mesa (master): scons: Fix egl-static build due to conflicting symbols.

[Jose Fonseca]

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

Author: José Fonseca <jose.r.fonseca at gmail.com>
Date:   Sun Apr 15 11:32:21 2012 +0100

scons: Fix egl-static build due to conflicting symbols.

radeonsi and r600 have duplicate symbols, so it's not possible to
statically link both.  Remove the newcomer, radeonsi, until duplicate
symbols are fixed.

---

 src/gallium/targets/egl-static/SConscript |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/gallium/targets/egl-static/SConscript b/src/gallium/targets/egl-static/SConscript
index d831b11..e657e9f 100644
--- a/src/gallium/targets/egl-static/SConscript
+++ b/src/gallium/targets/egl-static/SConscript
@@ -98,12 +98,11 @@ if env['HAVE_DRM']:
         ])
 
     if env['HAVE_DRM_RADEON']:
-        env.Append(CPPDEFINES = ['_EGL_PIPE_R300', '_EGL_PIPE_R600', '_EGL_PIPE_RADEONSI'])
+        env.Append(CPPDEFINES = ['_EGL_PIPE_R300', '_EGL_PIPE_R600'])
         env.Prepend(LIBS = [
             radeonwinsys,
             r300,
             r600,
-            radeonsi,
         ])
 
     env.Append(CPPDEFINES = ['_EGL_PIPE_VMWGFX'])