summaryrefslogtreecommitdiffstats
path: root/SConstruct
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2010-04-10 02:41:39 +0100
committerJosé Fonseca <jfonseca@vmware.com>2010-04-11 17:17:34 +0900
commitea532f0e725bd68e7784189c9b7f6f7bf7f9d901 (patch)
tree1b318d82380b08fb3f602597b61d797a2f5656bd /SConstruct
parent9fc93b80413d63aeb08b5a17602d111ed3899faf (diff)
downloadexternal_mesa3d-ea532f0e725bd68e7784189c9b7f6f7bf7f9d901.zip
external_mesa3d-ea532f0e725bd68e7784189c9b7f6f7bf7f9d901.tar.gz
external_mesa3d-ea532f0e725bd68e7784189c9b7f6f7bf7f9d901.tar.bz2
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 'SConstruct')
-rw-r--r--SConstruct14
1 files changed, 0 insertions, 14 deletions
diff --git a/SConstruct b/SConstruct
index 8b7ae7d..ebced16 100644
--- a/SConstruct
+++ b/SConstruct
@@ -81,15 +81,6 @@ debug = env['debug']
dri = env['dri']
machine = env['machine']
platform = env['platform']
-drawllvm = 'llvmpipe' in env['drivers']
-
-# LLVM support in the Draw module
-if drawllvm:
- env.Tool('llvm')
- if not env.has_key('LLVM_VERSION'):
- drawllvm = False
-if drawllvm:
- env.Append(CFLAGS = ['-DDRAW_LLVM=1'])
# derived options
x86 = machine == 'x86'
@@ -102,7 +93,6 @@ Export([
'x86',
'ppc',
'dri',
- 'drawllvm',
'platform',
'gcc',
'msvc',
@@ -167,10 +157,6 @@ if platform in ('posix', 'linux', 'freebsd', 'darwin'):
'dl',
])
-# LLVM support in the Draw module
-if drawllvm:
- env.Append(CPPDEFINES = ['DRAW_LLVM'])
-
# for debugging
#print env.Dump()