diff options
| author | Adam Jackson <[email protected]> | 2019-09-06 09:29:32 +0200 |
|---|---|---|
| committer | Adam Jackson <[email protected]> | 2019-09-11 17:00:43 +0000 |
| commit | 3c553d9cff0b541bb1f0c83b92458a312f40bb25 (patch) | |
| tree | 86897d7cc00e76083151433db774da3ae73aa43f /scons | |
| parent | 57855ff8aafb76222caacd11711577e8a1854799 (diff) | |
gallium: Require LLVM >= 3.5
Reviewed-by: Timothy Arceri <[email protected]>
Reviewed-by: Jose Fonseca <[email protected]>
[ Michel Dänzer: Dropped jessie line from debian-install.sh again ]
Diffstat (limited to 'scons')
| -rw-r--r-- | scons/llvm.py | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/scons/llvm.py b/scons/llvm.py index 2f65365060f..49e513ade18 100644 --- a/scons/llvm.py +++ b/scons/llvm.py @@ -37,7 +37,7 @@ import SCons.Errors import SCons.Util -required_llvm_version = '3.4' +required_llvm_version = '3.5' def generate(env): @@ -183,7 +183,7 @@ def generate(env): 'LLVMRuntimeDyld', 'LLVMObject', 'LLVMMCParser', 'LLVMBitReader', 'LLVMMC', 'LLVMCore', 'LLVMSupport' ]) - elif llvm_version >= distutils.version.LooseVersion('3.5'): + else: env.Prepend(LIBS = [ 'LLVMMCDisassembler', 'LLVMBitWriter', 'LLVMMCJIT', 'LLVMRuntimeDyld', @@ -196,18 +196,6 @@ def generate(env): 'LLVMAnalysis', 'LLVMTarget', 'LLVMMC', 'LLVMCore', 'LLVMSupport' ]) - else: - env.Prepend(LIBS = [ - 'LLVMMCDisassembler', - 'LLVMBitWriter', 'LLVMX86Disassembler', 'LLVMX86AsmParser', - 'LLVMX86CodeGen', 'LLVMX86Desc', 'LLVMSelectionDAG', - 'LLVMAsmPrinter', 'LLVMMCParser', 'LLVMX86AsmPrinter', - 'LLVMX86Utils', 'LLVMX86Info', 'LLVMMCJIT', 'LLVMJIT', - 'LLVMExecutionEngine', 'LLVMCodeGen', 'LLVMScalarOpts', - 'LLVMInstCombine', 'LLVMTransformUtils', 'LLVMipa', - 'LLVMAnalysis', 'LLVMTarget', 'LLVMMC', 'LLVMCore', - 'LLVMSupport', 'LLVMRuntimeDyld', 'LLVMObject' - ]) env.Append(LIBS = [ 'imagehlp', 'psapi', @@ -270,9 +258,8 @@ def generate(env): env.ParseConfig('%s --libs ' % llvm_config + ' '.join(components)) env.ParseConfig('%s --ldflags' % llvm_config) - if llvm_version >= distutils.version.LooseVersion('3.5'): - env.ParseConfig('%s --system-libs' % llvm_config) - env.Append(CXXFLAGS = ['-std=c++14']) + env.ParseConfig('%s --system-libs' % llvm_config) + env.Append(CXXFLAGS = ['-std=c++14']) except OSError: print('scons: llvm-config version %s failed' % llvm_version) return |