OSDN Git Service

scons: export drawllvm after actually checking that llvm is present
authorZack Rusin <zackr@vmware.com>
Wed, 10 Feb 2010 05:07:51 +0000 (00:07 -0500)
committerZack Rusin <zackr@vmware.com>
Wed, 10 Feb 2010 05:08:36 +0000 (00:08 -0500)
SConstruct

index fa67d14..2e00ec4 100644 (file)
@@ -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'):