diff options
| author | marha <marha@users.sourceforge.net> | 2014-05-23 19:43:56 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-05-23 19:43:56 +0200 |
| commit | 1c96f09adce1625dcbae5fe303d7c551a6c1bad3 (patch) | |
| tree | 70b5bbde90432287ae91513b8a4edcc55fcf9e9e /mesalib/scons | |
| parent | 697c9a1917acd36a1b99e0d263baf2514446ca11 (diff) | |
| parent | 63bfcd0be46413dda8c22b914d12f66ea5d5c66d (diff) | |
| download | vcxsrv-1c96f09adce1625dcbae5fe303d7c551a6c1bad3.tar.gz vcxsrv-1c96f09adce1625dcbae5fe303d7c551a6c1bad3.tar.bz2 vcxsrv-1c96f09adce1625dcbae5fe303d7c551a6c1bad3.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/gen/gl_gentable.py
xorg-server/include/servermd.h
Diffstat (limited to 'mesalib/scons')
| -rw-r--r-- | mesalib/scons/llvm.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/mesalib/scons/llvm.py b/mesalib/scons/llvm.py index cdfbe4370..288a0806f 100644 --- a/mesalib/scons/llvm.py +++ b/mesalib/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') |