summaryrefslogtreecommitdiffstats
path: root/scons
diff options
context:
space:
mode:
authorAdam Jackson <[email protected]>2019-09-06 09:50:16 +0200
committerAdam Jackson <[email protected]>2019-09-11 17:00:43 +0000
commit9abf7d575597e9dc534cccbb973f9e98338f48fe (patch)
tree2d00484b7a3aa018b71b29488ebe6ad98588ecb9 /scons
parent3c553d9cff0b541bb1f0c83b92458a312f40bb25 (diff)
gallium: Require LLVM >= 3.6
Reviewed-by: Timothy Arceri <[email protected]> Reviewed-by: Jose Fonseca <[email protected]>
Diffstat (limited to 'scons')
-rw-r--r--scons/llvm.py17
1 files changed, 2 insertions, 15 deletions
diff --git a/scons/llvm.py b/scons/llvm.py
index 49e513ade18..adb93e7f41e 100644
--- a/scons/llvm.py
+++ b/scons/llvm.py
@@ -37,7 +37,7 @@ import SCons.Errors
import SCons.Util
-required_llvm_version = '3.5'
+required_llvm_version = '3.6'
def generate(env):
@@ -171,7 +171,7 @@ def generate(env):
'LLVMRuntimeDyld', 'LLVMObject', 'LLVMMCParser',
'LLVMBitReader', 'LLVMMC', 'LLVMCore', 'LLVMSupport'
])
- elif llvm_version >= distutils.version.LooseVersion('3.6'):
+ else:
env.Prepend(LIBS = [
'LLVMBitWriter', 'LLVMX86Disassembler', 'LLVMX86AsmParser',
'LLVMX86CodeGen', 'LLVMSelectionDAG', 'LLVMAsmPrinter',
@@ -183,19 +183,6 @@ def generate(env):
'LLVMRuntimeDyld', 'LLVMObject', 'LLVMMCParser',
'LLVMBitReader', 'LLVMMC', 'LLVMCore', 'LLVMSupport'
])
- else:
- env.Prepend(LIBS = [
- 'LLVMMCDisassembler',
- 'LLVMBitWriter', 'LLVMMCJIT', 'LLVMRuntimeDyld',
- 'LLVMX86Disassembler', 'LLVMX86AsmParser', 'LLVMX86CodeGen',
- 'LLVMSelectionDAG', 'LLVMAsmPrinter', 'LLVMX86Desc',
- 'LLVMObject', 'LLVMMCParser', 'LLVMBitReader', 'LLVMX86Info',
- 'LLVMX86AsmPrinter', 'LLVMX86Utils', 'LLVMJIT',
- 'LLVMExecutionEngine', 'LLVMCodeGen', 'LLVMScalarOpts',
- 'LLVMInstCombine', 'LLVMTransformUtils', 'LLVMipa',
- 'LLVMAnalysis', 'LLVMTarget', 'LLVMMC', 'LLVMCore',
- 'LLVMSupport'
- ])
env.Append(LIBS = [
'imagehlp',
'psapi',