diff options
| author | José Fonseca <jfonseca@vmware.com> | 2014-10-22 13:09:59 +0100 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2014-10-23 10:18:56 +0100 |
| commit | 013ff2fae13da41c2f5619c4698b0a7b5aa6a06d (patch) | |
| tree | 27ba16255c5ee8cf8671b892fdfdcc53b0831010 /scons | |
| parent | 9ad80d1d1876493b45428b5f81b03add3ae8150e (diff) | |
| download | mesa-013ff2fae13da41c2f5619c4698b0a7b5aa6a06d.tar.gz mesa-013ff2fae13da41c2f5619c4698b0a7b5aa6a06d.tar.bz2 mesa-013ff2fae13da41c2f5619c4698b0a7b5aa6a06d.zip | |
gallivm,llvmpipe,clover: Bump required LLVM version to 3.3.
We'll need to update gallivm for the interface changes in LLVM 3.6, and
the fewer the number of older LLVM versions we support the less hairy that
will be.
As consequence HAVE_AVX define can disappear. (Note HAVE_AVX meant
whether LLVM version supports AVX or not. Runtime support for AVX is
always checked and enforced independently.)
Verified llvmpipe builds and runs with with LLVM 3.3, 3.4, and 3.5.
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Diffstat (limited to 'scons')
| -rw-r--r-- | scons/llvm.py | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/scons/llvm.py b/scons/llvm.py index 288a0806f2a..1e312f94de3 100644 --- a/scons/llvm.py +++ b/scons/llvm.py @@ -37,7 +37,7 @@ import SCons.Errors import SCons.Util -required_llvm_version = '3.1' +required_llvm_version = '3.3' def generate(env): @@ -98,7 +98,7 @@ def generate(env): 'HAVE_STDINT_H', ]) env.Prepend(LIBPATH = [os.path.join(llvm_dir, 'lib')]) - if llvm_version >= distutils.version.LooseVersion('3.2'): + if True: # 3.2 env.Prepend(LIBS = [ 'LLVMBitWriter', 'LLVMX86Disassembler', 'LLVMX86AsmParser', @@ -110,18 +110,6 @@ def generate(env): 'LLVMAnalysis', 'LLVMTarget', 'LLVMMC', 'LLVMCore', 'LLVMSupport', 'LLVMRuntimeDyld', 'LLVMObject' ]) - else: - # 3.1 - env.Prepend(LIBS = [ - 'LLVMBitWriter', 'LLVMX86Disassembler', 'LLVMX86AsmParser', - 'LLVMX86CodeGen', 'LLVMX86Desc', 'LLVMSelectionDAG', - 'LLVMAsmPrinter', 'LLVMMCParser', 'LLVMX86AsmPrinter', - 'LLVMX86Utils', 'LLVMX86Info', 'LLVMMCJIT', 'LLVMJIT', - 'LLVMExecutionEngine', 'LLVMCodeGen', 'LLVMScalarOpts', - 'LLVMInstCombine', 'LLVMTransformUtils', 'LLVMipa', - 'LLVMAnalysis', 'LLVMTarget', 'LLVMMC', 'LLVMCore', - 'LLVMSupport' - ]) env.Append(LIBS = [ 'imagehlp', 'psapi', |