From db2e1518ff4ecb4a394076321ea5cdda3483ccbe Mon Sep 17 00:00:00 2001 From: José Fonseca Date: Thu, 25 Feb 2010 17:02:52 +0000 Subject: scons: Always build trace driver There are so many state trackers and winsys that rely on it for debug building, and trace can really build anywhere and is thin so there's no point is making it an option. Based on Xavier Chantry 's patch: "I also removed the trace check in xlib SConscript which is now useless, and that script seems to deal with the cell driver, so I added cell in the check for supported drivers." --- SConstruct | 4 ++++ src/gallium/winsys/xlib/SConscript | 6 +----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/SConstruct b/SConstruct index ea63b90f46..e1c4a1898c 100644 --- a/SConstruct +++ b/SConstruct @@ -110,6 +110,10 @@ Export([ ####################################################################### # Environment setup +# Always build trace driver +if 'trace' not in env['drivers']: + env['drivers'].append('trace') + # Includes env.Append(CPPPATH = [ '#/include', diff --git a/src/gallium/winsys/xlib/SConscript b/src/gallium/winsys/xlib/SConscript index a4dabb7804..8c9d318af2 100644 --- a/src/gallium/winsys/xlib/SConscript +++ b/src/gallium/winsys/xlib/SConscript @@ -14,11 +14,7 @@ if env['dri']: print 'warning: DRI enabled: skipping build of xlib libGL.so' Return() -if 'trace' not in env['drivers']: - print 'warning: trace pipe driver disabled: skipping build of xlib libGL.so' - Return() - -if not set(('softpipe', 'llvmpipe', 'trace')).intersection(env['drivers']): +if not set(('softpipe', 'llvmpipe', 'cell')).intersection(env['drivers']): print 'warning: no supported pipe driver: skipping build of xlib libGL.so' Return() -- cgit v1.2.3