From: José Fonseca <jfonseca@vmware.com>
Date: Thu, 22 Oct 2009 18:11:48 +0000 (+0100)
Subject: scons: Hack LLVM support on Windows.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bf48447cafc8069839ad41c9c11078c794f4b307;p=mesa.git

scons: Hack LLVM support on Windows.

Doesn't quite work yet though, as small differences in the compilation flags
used when building LLVM and Mesa cause link failures for STL symbols.
---

diff --git a/scons/llvm.py b/scons/llvm.py
index d3293bb404f..73e9310f71b 100644
--- a/scons/llvm.py
+++ b/scons/llvm.py
@@ -29,6 +29,7 @@ Tool-specific initialization for LLVM
 
 import os
 import os.path
+import sys
 
 import SCons.Errors
 import SCons.Util
@@ -39,7 +40,7 @@ def generate(env):
         llvm_dir = os.environ['LLVM']
     except KeyError:
         # Do nothing -- use the system headers/libs
-        pass
+        llvm_dir = None
     else:
         if not os.path.isdir(llvm_dir):
             raise SCons.Errors.InternalError, "Specified LLVM directory not found"
@@ -57,7 +58,47 @@ def generate(env):
 
         env.PrependENVPath('PATH', llvm_bin_dir)
 
-    if env.Detect('llvm-config'):
+    if env['msvc']:
+        # XXX: There is no llvm-config on Windows, so assume a standard layout
+        if llvm_dir is not None:
+            env.Prepend(CPPPATH = [os.path.join(llvm_dir, 'include')])
+            env.Prepend(LIBPATH = [os.path.join(llvm_dir, 'lib')])
+            env.Prepend(LIBS = [
+                'LLVMBitWriter',
+                'LLVMCore',
+                'LLVMSupport',
+                'LLVMSystem',
+                'LLVMSupport',
+                'LLVMSystem',
+                'LLVMCore',
+                'LLVMCodeGen',
+                'LLVMSelectionDAG',
+                'LLVMAsmPrinter',
+                'LLVMBitReader',
+                'LLVMBitWriter',
+                'LLVMTransformUtils',
+                'LLVMInstrumentation',
+                'LLVMScalarOpts',
+                'LLVMipo',
+                'LLVMHello',
+                'LLVMLinker',
+                'LLVMAnalysis',
+                'LLVMipa',
+                'LLVMX86CodeGen',
+                'LLVMX86AsmPrinter',
+                'LLVMExecutionEngine',
+                'LLVMInterpreter',
+                'LLVMJIT',
+                'LLVMTarget',
+                'LLVMAsmParser',
+                'LLVMDebugger',
+                'LLVMArchive',
+                'imagehlp',
+                'psapi',
+            ])
+            env['LLVM_VERSION'] = '2.5'
+        return
+    elif env.Detect('llvm-config'):
         version = env.backtick('llvm-config --version').rstrip()
 
         try: