Mesa (master): scons: export drawllvm after actually checking that llvm is present
Zack Rusin
zack at kemper.freedesktop.org
Wed Feb 10 05:09:00 UTC 2010
Module: Mesa
Branch: master
Commit: 08e2eab8a430402c12a551c539bbc68f1f857def
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=08e2eab8a430402c12a551c539bbc68f1f857def
Author: Zack Rusin <zackr at vmware.com>
Date: Wed Feb 10 00:07:51 2010 -0500
scons: export drawllvm after actually checking that llvm is present
---
SConstruct | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/SConstruct b/SConstruct
index fa67d14..2e00ec4 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'):
More information about the mesa-commit
mailing list