diff options
| author | José Fonseca <[email protected]> | 2012-04-15 11:32:21 +0100 |
|---|---|---|
| committer | José Fonseca <[email protected]> | 2012-04-15 11:32:21 +0100 |
| commit | abfe7591729c2ac205e17b0f873f843aea99c09b (patch) | |
| tree | 770243f6b66c85e5a315354f6af2102fa458b714 /src/gallium | |
| parent | e44089b2f79aa2dcaacf348911433d1e21235c0c (diff) | |
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.
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | 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 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']) |