summaryrefslogtreecommitdiff
path: root/scons
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2009-09-04 19:33:41 +0100
committerJosé Fonseca <jfonseca@vmware.com>2009-09-04 19:34:11 +0100
commitb9f56078cd8b68e3f473d23232c1aa2f0f664a19 (patch)
treef436e3ebc8528836d748e490fb9866a129db8c23 /scons
parentb13a553dd419cc6997725d4bce956daa7eb64806 (diff)
scons: Don't use scons internal functions.
Diffstat (limited to 'scons')
-rw-r--r--scons/llvm.py17
1 files changed, 4 insertions, 13 deletions
diff --git a/scons/llvm.py b/scons/llvm.py
index 14306bc0fe..53cf71c03f 100644
--- a/scons/llvm.py
+++ b/scons/llvm.py
@@ -29,9 +29,7 @@ Tool-specific initialization for LLVM
import os
import os.path
-import subprocess
-import SCons.Action
import SCons.Errors
import SCons.Util
@@ -58,17 +56,10 @@ def generate(env):
env.PrependENVPath('PATH', llvm_bin_dir)
if env.Detect('llvm-config'):
- pipe = SCons.Action._subproc(env,
- ['llvm-config', '--version'],
- stdin = 'devnull',
- stderr = 'devnull',
- stdout = subprocess.PIPE)
- if pipe.wait() != 0:
- return
- line = pipe.stdout.read().strip()
- if not line:
- return
- env['LLVM_VERSION'] = line
+ try:
+ env['LLVM_VERSION'] = env.backtick('llvm-config --version')
+ except NameError:
+ env['LLVM_VERSION'] = 'X.X'
env.ParseConfig('llvm-config --cppflags')
env.ParseConfig('llvm-config --libs jit interpreter nativecodegen bitwriter')