From 08e2eab8a430402c12a551c539bbc68f1f857def Mon Sep 17 00:00:00 2001 From: Zack Rusin Date: Wed, 10 Feb 2010 00:07:51 -0500 Subject: scons: export drawllvm after actually checking that llvm is present --- SConstruct | 13 ++++++------- 1 file 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'): -- cgit v1.2.3