From abfe7591729c2ac205e17b0f873f843aea99c09b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Sun, 15 Apr 2012 11:32:21 +0100 Subject: [PATCH] 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 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/gallium/targets/egl-static/SConscript b/src/gallium/targets/egl-static/SConscript index d831b110764..e657e9f2ff5 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']) -- 2.30.2