summaryrefslogtreecommitdiff
path: root/SConstruct
diff options
context:
space:
mode:
authorZack Rusin <zackr@vmware.com>2010-02-10 00:07:51 -0500
committerZack Rusin <zackr@vmware.com>2010-02-10 00:08:36 -0500
commit08e2eab8a430402c12a551c539bbc68f1f857def (patch)
tree2a5f8918e02e1b9e8ef88fee339464db73b2c9bd /SConstruct
parentc19dab7c5929bc70633002111bbb2b496a90899e (diff)
scons: export drawllvm after actually checking that llvm is present
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct13
1 files changed, 6 insertions, 7 deletions
diff --git a/SConstruct b/SConstruct
index fa67d14b795..2e00ec47bd1 100644
--- a/SConstruct
+++ b/SConstruct
@@ -83,6 +83,11 @@ 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
# derived options
x86 = machine == 'x86'
@@ -168,13 +173,7 @@ if dri:
# LLVM support in the Draw module
if drawllvm:
- # See also http://www.scons.org/wiki/UsingPkgConfig
- # currently --ldflags --libsdisabled since the driver will force the correct linkage
- env.Tool('llvm')
- if not env.has_key('LLVM_VERSION'):
- drawllvm = False
- else:
- env.Append(CPPDEFINES = ['DRAW_LLVM'])
+ env.Append(CPPDEFINES = ['DRAW_LLVM'])
# libGL
if platform in ('linux', 'freebsd', 'darwin'):