Commit 08e2eab8 authored by Zack Rusin's avatar Zack Rusin
Browse files

scons: export drawllvm after actually checking that llvm is present

parent c19dab7c
...@@ -83,6 +83,11 @@ machine = env['machine'] ...@@ -83,6 +83,11 @@ machine = env['machine']
platform = env['platform'] platform = env['platform']
drawllvm = 'llvmpipe' in env['drivers'] 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 # derived options
x86 = machine == 'x86' x86 = machine == 'x86'
...@@ -168,12 +173,6 @@ if dri: ...@@ -168,12 +173,6 @@ if dri:
# LLVM support in the Draw module # LLVM support in the Draw module
if drawllvm: 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 # libGL
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment