diff options
| author | José Fonseca <jfonseca@vmware.com> | 2014-05-14 12:20:14 +0100 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2014-05-23 11:37:47 +0100 |
| commit | 2c02f34fccee563e22db70cbfb03fb2cc7da30f9 (patch) | |
| tree | 41a7340cdbf4fd9376b8eacec74bfa3cd7983e44 /scons | |
| parent | 94dbc16dc4c1b7685a9dab89a39e8fea844194df (diff) | |
| download | mesa-2c02f34fccee563e22db70cbfb03fb2cc7da30f9.tar.gz mesa-2c02f34fccee563e22db70cbfb03fb2cc7da30f9.tar.bz2 mesa-2c02f34fccee563e22db70cbfb03fb2cc7da30f9.zip | |
gallivm: Support MCJIT on Windows.
It works fine, though it requires using ELF objects.
With this change there is nothing preventing us to switch exclusively
to MCJIT, everywhere. It's still off though.
Diffstat (limited to 'scons')
| -rw-r--r-- | scons/llvm.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/scons/llvm.py b/scons/llvm.py index cdfbe43708f..288a0806f2a 100644 --- a/scons/llvm.py +++ b/scons/llvm.py @@ -104,7 +104,7 @@ def generate(env): 'LLVMBitWriter', 'LLVMX86Disassembler', 'LLVMX86AsmParser', 'LLVMX86CodeGen', 'LLVMX86Desc', 'LLVMSelectionDAG', 'LLVMAsmPrinter', 'LLVMMCParser', 'LLVMX86AsmPrinter', - 'LLVMX86Utils', 'LLVMX86Info', 'LLVMJIT', + 'LLVMX86Utils', 'LLVMX86Info', 'LLVMMCJIT', 'LLVMJIT', 'LLVMExecutionEngine', 'LLVMCodeGen', 'LLVMScalarOpts', 'LLVMInstCombine', 'LLVMTransformUtils', 'LLVMipa', 'LLVMAnalysis', 'LLVMTarget', 'LLVMMC', 'LLVMCore', @@ -116,7 +116,7 @@ def generate(env): 'LLVMBitWriter', 'LLVMX86Disassembler', 'LLVMX86AsmParser', 'LLVMX86CodeGen', 'LLVMX86Desc', 'LLVMSelectionDAG', 'LLVMAsmPrinter', 'LLVMMCParser', 'LLVMX86AsmPrinter', - 'LLVMX86Utils', 'LLVMX86Info', 'LLVMJIT', + 'LLVMX86Utils', 'LLVMX86Info', 'LLVMMCJIT', 'LLVMJIT', 'LLVMExecutionEngine', 'LLVMCodeGen', 'LLVMScalarOpts', 'LLVMInstCombine', 'LLVMTransformUtils', 'LLVMipa', 'LLVMAnalysis', 'LLVMTarget', 'LLVMMC', 'LLVMCore', @@ -165,9 +165,7 @@ def generate(env): if '-fno-rtti' in cxxflags: env.Append(CXXFLAGS = ['-fno-rtti']) - components = ['engine', 'bitwriter', 'x86asmprinter'] - - components.append('mcjit') + components = ['engine', 'mcjit', 'bitwriter', 'x86asmprinter'] env.ParseConfig('llvm-config --libs ' + ' '.join(components)) env.ParseConfig('llvm-config --ldflags') |