1 files changed, 11 insertions, 0 deletions
diff --git a/scons/llvm.py b/scons/llvm.py
index 7b266502907..37c503ec986 100644
--- a/scons/llvm.py
+++ b/scons/llvm.py
@@ -65,6 +65,7 @@ def generate(env):
             env.AppendUnique(CPPDEFINES = [
                 '__STDC_LIMIT_MACROS', 
                 '__STDC_CONSTANT_MACROS',
+                'HAVE_STDINT_H',
             ])
             env.Prepend(LIBPATH = [os.path.join(llvm_dir, 'lib')])
             env.Prepend(LIBS = [
@@ -98,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'):