summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2010-01-10 10:51:42 +0000
committerJosé Fonseca <jfonseca@vmware.com>2010-01-10 10:51:42 +0000
commita921458c1608a140ccb8649bdc26305af0de26e3 (patch)
treee302ad04d52e9b521912fc5f513cb65e66edc831
parent74f520861ff43f3b146f32927d7c03067a41d6a5 (diff)
scons: LLVM <-> MSVC integration tweaks.
-rw-r--r--scons/llvm.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/scons/llvm.py b/scons/llvm.py
index 5b9c82f110..37c503ec98 100644
--- a/scons/llvm.py
+++ b/scons/llvm.py
@@ -99,6 +99,16 @@ def generate(env):
'imagehlp',
'psapi',
])
+ if env['msvc']:
+ # Some of the LLVM C headers use the inline keyword without
+ # defining it.
+ env.Append(CPPDEFINES = [('inline', '__inline')])
+ if env['debug']:
+ # LLVM libraries are static, build with /MT, and they
+ # automatically link agains LIBCMT. When we're doing a
+ # debug build we'll be linking against LIBCMTD, so disable
+ # that.
+ env.Append(LINKFLAGS = ['/nodefaultlib:LIBCMT'])
env['LLVM_VERSION'] = '2.6'
return
elif env.Detect('llvm-config'):