summaryrefslogtreecommitdiff
path: root/scons
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2009-09-16 10:39:06 +0100
committerJosé Fonseca <jfonseca@vmware.com>2009-09-16 11:35:23 +0100
commit459ea0095c31eff835b25dd3eef48a4c073d05f9 (patch)
treeed7122cbcd6cb26ccf8b85bb1457645c801e292a /scons
parent858a2a2ac7b1c8f1a7f7c4b3c66b3919989798d4 (diff)
llvmpipe: Make the code portable for MinGW.
Diffstat (limited to 'scons')
-rw-r--r--scons/llvm.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/scons/llvm.py b/scons/llvm.py
index 46a8d829ca..d3293bb404 100644
--- a/scons/llvm.py
+++ b/scons/llvm.py
@@ -51,7 +51,9 @@ def generate(env):
llvm_bin_dir = os.path.join(llvm_dir, llvm_subdir, 'bin')
if not os.path.isdir(llvm_bin_dir):
- raise SCons.Errors.InternalError, "LLVM build directory not found"
+ llvm_bin_dir = os.path.join(llvm_dir, 'bin')
+ if not os.path.isdir(llvm_bin_dir):
+ raise SCons.Errors.InternalError, "LLVM binary directory not found"
env.PrependENVPath('PATH', llvm_bin_dir)
@@ -65,6 +67,8 @@ def generate(env):
except OSError:
print 'llvm-config version %s failed' % version
else:
+ if env['platform'] == 'windows':
+ env.Append(LIBS = ['imagehlp', 'psapi'])
env['LINK'] = env['CXX']
env['LLVM_VERSION'] = version