From 96b592696f13be09621bc50be31a89fde54b18e2 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Fri, 6 Sep 2019 09:50:32 +0200 Subject: gallium: Require LLVM >= 3.9 To go any further than this would be to break the current version of Android. Reviewed-by: Timothy Arceri Reviewed-by: Jose Fonseca --- scons/llvm.py | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'scons') diff --git a/scons/llvm.py b/scons/llvm.py index 8d03d7ace06..4464b665751 100644 --- a/scons/llvm.py +++ b/scons/llvm.py @@ -37,7 +37,7 @@ import SCons.Errors import SCons.Util -required_llvm_version = '3.8' +required_llvm_version = '3.9' def generate(env): @@ -142,7 +142,7 @@ def generate(env): 'LLVMIRReader', 'LLVMAsmParser', 'LLVMDemangle', 'LLVMGlobalISel', 'LLVMDebugInfoMSF', ]) - elif llvm_version >= distutils.version.LooseVersion('3.9'): + else: env.Prepend(LIBS = [ 'LLVMX86Disassembler', 'LLVMX86AsmParser', 'LLVMX86CodeGen', 'LLVMSelectionDAG', 'LLVMAsmPrinter', @@ -159,18 +159,6 @@ def generate(env): 'LLVMSupport', 'LLVMIRReader', 'LLVMASMParser' ]) - else: - 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' - ]) env.Append(LIBS = [ 'imagehlp', 'psapi', -- cgit v1.2.3