diff options
| author | José Fonseca <jfonseca@vmware.com> | 2010-04-10 02:41:39 +0100 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2010-04-11 17:17:34 +0900 |
| commit | ea532f0e725bd68e7784189c9b7f6f7bf7f9d901 (patch) | |
| tree | 1b318d82380b08fb3f602597b61d797a2f5656bd /src/gallium/targets | |
| parent | 9fc93b80413d63aeb08b5a17602d111ed3899faf (diff) | |
scons: Make LLVM a black-white dependency.
Now that draw depends on llvm it is very difficult to correctly handle
broken llvm installations. Either the user requests LLVM and it needs to
supply a working installation. Or it doesn't, and it gets no LLVM
accelerate pipe drivers.
Diffstat (limited to 'src/gallium/targets')
| -rw-r--r-- | src/gallium/targets/dri-swrast/SConscript | 8 | ||||
| -rw-r--r-- | src/gallium/targets/graw-xlib/SConscript | 8 | ||||
| -rw-r--r-- | src/gallium/targets/libgl-gdi/SConscript | 6 | ||||
| -rw-r--r-- | src/gallium/targets/libgl-xlib/SConscript | 8 |
4 files changed, 11 insertions, 19 deletions
diff --git a/src/gallium/targets/dri-swrast/SConscript b/src/gallium/targets/dri-swrast/SConscript index 94ff99a0a9..9a3838d64e 100644 --- a/src/gallium/targets/dri-swrast/SConscript +++ b/src/gallium/targets/dri-swrast/SConscript @@ -25,11 +25,9 @@ if 'softpipe' in env['drivers']: env.Prepend(LIBS = [softpipe]) if 'llvmpipe' in env['drivers']: - env.Tool('llvm') - if 'LLVM_VERSION' in env: - env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE') - env.Tool('udis86') - env.Prepend(LIBS = [llvmpipe]) + env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE') + env.Tool('udis86') + env.Prepend(LIBS = [llvmpipe]) swrastg_sources = [ 'swrast_drm_api.c' diff --git a/src/gallium/targets/graw-xlib/SConscript b/src/gallium/targets/graw-xlib/SConscript index 24cea92f90..1b5350a9a4 100644 --- a/src/gallium/targets/graw-xlib/SConscript +++ b/src/gallium/targets/graw-xlib/SConscript @@ -33,11 +33,9 @@ if 'softpipe' in env['drivers']: env.Prepend(LIBS = [softpipe]) if 'llvmpipe' in env['drivers']: - env.Tool('llvm') - if 'LLVM_VERSION' in env: - env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE') - env.Tool('udis86') - env.Prepend(LIBS = [llvmpipe]) + env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE') + env.Tool('udis86') + env.Prepend(LIBS = [llvmpipe]) # Need this for trace, identity drivers referenced by # gallium_wrap_screen(). diff --git a/src/gallium/targets/libgl-gdi/SConscript b/src/gallium/targets/libgl-gdi/SConscript index 21b4eb2abe..a6ef1f2406 100644 --- a/src/gallium/targets/libgl-gdi/SConscript +++ b/src/gallium/targets/libgl-gdi/SConscript @@ -27,10 +27,8 @@ if env['platform'] == 'windows': drivers = [softpipe] if 'llvmpipe' in env['drivers']: - env.Tool('llvm') - if 'LLVM_VERSION' in env: - sources = ['gdi_llvmpipe_winsys.c'] - drivers = [llvmpipe] + sources = ['gdi_llvmpipe_winsys.c'] + drivers = [llvmpipe] if not sources or not drivers: print 'warning: softpipe or llvmpipe not selected, gdi winsys disabled' diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript index c1614d4a9f..0d2ffd2070 100644 --- a/src/gallium/targets/libgl-xlib/SConscript +++ b/src/gallium/targets/libgl-xlib/SConscript @@ -50,11 +50,9 @@ if 'softpipe' in env['drivers']: env.Prepend(LIBS = [softpipe]) if 'llvmpipe' in env['drivers']: - env.Tool('llvm') - if 'LLVM_VERSION' in env: - env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE') - env.Tool('udis86') - env.Prepend(LIBS = [llvmpipe]) + env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE') + env.Tool('udis86') + env.Prepend(LIBS = [llvmpipe]) if 'cell' in env['drivers']: env.Append(CPPDEFINES = 'GALLIUM_CELL') |