diff options
| author | marha <marha@users.sourceforge.net> | 2015-06-15 21:36:28 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-06-15 21:36:28 +0200 |
| commit | 008a8d8051786badb83e455bd9281103ba9a6470 (patch) | |
| tree | f99ea672d105271cb60a726fac8022ce47ea2866 /mesalib/scons/llvm.py | |
| parent | 912e881bec8b16f2331225960645c3bdf5a8ba2d (diff) | |
| parent | e8d5e7c4bb11f7fcb0a4ba5c13f43e7929849a2f (diff) | |
| download | vcxsrv-008a8d8051786badb83e455bd9281103ba9a6470.tar.gz vcxsrv-008a8d8051786badb83e455bd9281103ba9a6470.tar.bz2 vcxsrv-008a8d8051786badb83e455bd9281103ba9a6470.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
freetype/src/base/ftfntfmt.c
freetype/src/cache/ftcimage.c
freetype/src/cid/cidriver.c
freetype/src/truetype/ttdriver.c
mesalib/src/mesa/drivers/dri/common/dri_util.c
mesalib/src/mesa/drivers/dri/swrast/swrast.c
openssl/Makefile
Diffstat (limited to 'mesalib/scons/llvm.py')
| -rw-r--r-- | mesalib/scons/llvm.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesalib/scons/llvm.py b/mesalib/scons/llvm.py index 17278df88..c59b8cb93 100644 --- a/mesalib/scons/llvm.py +++ b/mesalib/scons/llvm.py @@ -120,6 +120,7 @@ def generate(env): ]) elif llvm_version >= distutils.version.LooseVersion('3.5'): env.Prepend(LIBS = [ + 'LLVMMCDisassembler', 'LLVMBitWriter', 'LLVMMCJIT', 'LLVMRuntimeDyld', 'LLVMX86Disassembler', 'LLVMX86AsmParser', 'LLVMX86CodeGen', 'LLVMSelectionDAG', 'LLVMAsmPrinter', 'LLVMX86Desc', @@ -132,6 +133,7 @@ def generate(env): ]) else: env.Prepend(LIBS = [ + 'LLVMMCDisassembler', 'LLVMBitWriter', 'LLVMX86Disassembler', 'LLVMX86AsmParser', 'LLVMX86CodeGen', 'LLVMX86Desc', 'LLVMSelectionDAG', 'LLVMAsmPrinter', 'LLVMMCParser', 'LLVMX86AsmPrinter', @@ -189,7 +191,7 @@ def generate(env): if '-fno-rtti' in cxxflags: env.Append(CXXFLAGS = ['-fno-rtti']) - components = ['engine', 'mcjit', 'bitwriter', 'x86asmprinter'] + components = ['engine', 'mcjit', 'bitwriter', 'x86asmprinter', 'mcdisassembler'] env.ParseConfig('llvm-config --libs ' + ' '.join(components)) env.ParseConfig('llvm-config --ldflags') |