Mesa (master): scons: Add support for LLVM-2.9 on Windows.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Thu Aug 18 08:01:08 PDT 2011


Module: Mesa
Branch: master
Commit: 7be4cf9c63d3dcacce8a6bf47c471a9aab09b1d7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7be4cf9c63d3dcacce8a6bf47c471a9aab09b1d7

Author: José Fonseca <jfonseca at vmware.com>
Date:   Thu Aug 18 16:00:03 2011 +0100

scons: Add support for LLVM-2.9 on Windows.

MinGW & MSVC, although I've only tested the former.

---

 scons/llvm.py |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/scons/llvm.py b/scons/llvm.py
index 66f972d..c8d2d37 100644
--- a/scons/llvm.py
+++ b/scons/llvm.py
@@ -92,7 +92,21 @@ def generate(env):
             'HAVE_STDINT_H',
         ])
         env.Prepend(LIBPATH = [os.path.join(llvm_dir, 'lib')])
-        if llvm_version >= distutils.version.LooseVersion('2.7'):
+        if llvm_version >= distutils.version.LooseVersion('2.9'):
+            # 2.9
+            env.Prepend(LIBS = [
+                'LLVMObject', 'LLVMMCJIT', 'LLVMMCDisassembler',
+                'LLVMLinker', 'LLVMipo', 'LLVMInterpreter',
+                'LLVMInstrumentation', 'LLVMJIT', 'LLVMExecutionEngine',
+                'LLVMBitWriter', 'LLVMX86Disassembler', 'LLVMX86AsmParser',
+                'LLVMMCParser', 'LLVMX86AsmPrinter', 'LLVMX86CodeGen',
+                'LLVMSelectionDAG', 'LLVMX86Utils', 'LLVMX86Info', 'LLVMAsmPrinter',
+                'LLVMCodeGen', 'LLVMScalarOpts', 'LLVMInstCombine',
+                'LLVMTransformUtils', 'LLVMipa', 'LLVMAsmParser',
+                'LLVMArchive', 'LLVMBitReader', 'LLVMAnalysis', 'LLVMTarget',
+                'LLVMCore', 'LLVMMC', 'LLVMSupport',
+            ])
+        elif llvm_version >= distutils.version.LooseVersion('2.7'):
             # 2.7
             env.Prepend(LIBS = [
                 'LLVMLinker', 'LLVMipo', 'LLVMInterpreter',



More information about the mesa-commit mailing list