diff options
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/SConstruct b/SConstruct index fa67d14b79..964af7e591 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'): @@ -226,8 +225,9 @@ SConscript( duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html ) -SConscript( - 'progs/SConscript', - variant_dir = os.path.join('progs', env['build']), - duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html -) +if 'progs' in COMMAND_LINE_TARGETS: + SConscript( + 'progs/SConscript', + variant_dir = os.path.join('progs', env['build']), + duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html + ) |