From 59f18f21595c46f103a0efecd19d4137d179ecab Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Fri, 6 Sep 2019 09:50:22 +0200 Subject: gallium: Require LLVM >= 3.7 Reviewed-by: Timothy Arceri Reviewed-by: Jose Fonseca --- scons/llvm.py | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'scons/llvm.py') diff --git a/scons/llvm.py b/scons/llvm.py index adb93e7f41e..30a74d85ca5 100644 --- a/scons/llvm.py +++ b/scons/llvm.py @@ -37,7 +37,7 @@ import SCons.Errors import SCons.Util -required_llvm_version = '3.6' +required_llvm_version = '3.7' def generate(env): @@ -159,24 +159,12 @@ def generate(env): 'LLVMSupport', 'LLVMIRReader', 'LLVMASMParser' ]) - elif llvm_version >= distutils.version.LooseVersion('3.7'): - env.Prepend(LIBS = [ - 'LLVMBitWriter', 'LLVMX86Disassembler', 'LLVMX86AsmParser', - 'LLVMX86CodeGen', 'LLVMSelectionDAG', 'LLVMAsmPrinter', - 'LLVMCodeGen', 'LLVMScalarOpts', 'LLVMProfileData', - 'LLVMInstCombine', 'LLVMInstrumentation', 'LLVMTransformUtils', 'LLVMipa', - 'LLVMAnalysis', 'LLVMX86Desc', 'LLVMMCDisassembler', - 'LLVMX86Info', 'LLVMX86AsmPrinter', 'LLVMX86Utils', - 'LLVMMCJIT', 'LLVMTarget', 'LLVMExecutionEngine', - 'LLVMRuntimeDyld', 'LLVMObject', 'LLVMMCParser', - 'LLVMBitReader', 'LLVMMC', 'LLVMCore', 'LLVMSupport' - ]) else: env.Prepend(LIBS = [ 'LLVMBitWriter', 'LLVMX86Disassembler', 'LLVMX86AsmParser', 'LLVMX86CodeGen', 'LLVMSelectionDAG', 'LLVMAsmPrinter', 'LLVMCodeGen', 'LLVMScalarOpts', 'LLVMProfileData', - 'LLVMInstCombine', 'LLVMTransformUtils', 'LLVMipa', + 'LLVMInstCombine', 'LLVMInstrumentation', 'LLVMTransformUtils', 'LLVMipa', 'LLVMAnalysis', 'LLVMX86Desc', 'LLVMMCDisassembler', 'LLVMX86Info', 'LLVMX86AsmPrinter', 'LLVMX86Utils', 'LLVMMCJIT', 'LLVMTarget', 'LLVMExecutionEngine', -- cgit v1.2.3