From: José Fonseca <jfonseca@vmware.com>
Date: Sun, 10 Jan 2010 10:51:42 +0000 (+0000)
Subject: scons: LLVM <-> MSVC integration tweaks.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a921458c1608a140ccb8649bdc26305af0de26e3;p=mesa.git

scons: LLVM <-> MSVC integration tweaks.
---

diff --git a/scons/llvm.py b/scons/llvm.py
index 5b9c82f1103..37c503ec986 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'):