Merge branch '7.8'

[mesa.git] / src / gallium / state_trackers / python / SConscript

diff --git a/src/gallium/state_trackers/python/SConscript b/src/gallium/state_trackers/python/SConscript
index d0d141fd2496299b02ba3b3a01b8493e40ce6308..aadeaa0a35918dd9fb7fb6cfabbd58d98252581f 100644 (file)
--- a/src/gallium/state_trackers/python/SConscript
+++ b/src/gallium/state_trackers/python/SConscript
@@ -3,8 +3,7 @@ import os.path
 
 Import('*')
 
-if 'python' in env['statetrackers'] and 0:
-    # FIXME: Disable python state tracker until transfers are done by contexts  
+if 'python' in env['statetrackers']:
 
     env = env.Clone()
     
@@ -45,11 +44,10 @@ if 'python' in env['statetrackers'] and 0:
         gallium,
     ])
 
-    if 'llvmpipe' in env['drivers']:
+    if env['llvm']:
         env.Append(CPPDEFINES = ['HAVE_LLVMPIPE'])
-        env.Tool('llvm')
         env.Prepend(LIBS = [llvmpipe])
-    if 'softpipe' in env['drivers']:
+    if True:
         env.Append(CPPDEFINES = ['HAVE_SOFTPIPE'])
         env.Prepend(LIBS = [softpipe])