Mesa (staging/20.0): scons/windows: Support build with LLVM 10.

[GitLab Mirror]

Module: Mesa
Branch: staging/20.0
Commit: c71cf8561582b4ddd54dbf3f77254379f7103a93
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c71cf8561582b4ddd54dbf3f77254379f7103a93

Author: pal1000 <liviuprodea at yahoo.com>
Date:   Sat Apr 11 11:16:41 2020 +0300

scons/windows: Support build with LLVM 10.

LLVM engine component contains 2 new libraries, LLVMCFGuard and LLVMTextAPI.
Without them build fails like in this run: https://ci.appveyor.com/project/Alexpux/mingw-packages/builds/32102425/job/wkmb4gimfqkkb3cg

Cc: <mesa-stable at lists.freedesktop.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4521>
(cherry picked from commit f0b94262c18284dc61755634f01eb78051b4423e)

---

 .pick_status.json |  2 +-
 scons/llvm.py     | 25 ++++++++++++++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index cbcf0427f2a..0126b1921a8 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -94,7 +94,7 @@
         "description": "scons/windows: Support build with LLVM 10.",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/scons/llvm.py b/scons/llvm.py
index 6d04bd55522..dac3555995b 100644
--- a/scons/llvm.py
+++ b/scons/llvm.py
@@ -111,7 +111,30 @@ def generate(env):
         # and `llvm-config --libs engine coroutines` for LLVM>=8.0
         # LLVMAggressiveInstCombine library part of engine component since LLVM 6 is only needed by Mesa3D for LLVM>=8.
         # While not directly needed by Mesa3D, this library is needed by LLVMipo which is part of coroutines component.
-        if llvm_version >= distutils.version.LooseVersion('9.0'):
+        if llvm_version >= distutils.version.LooseVersion('10.0'):
+            env.Prepend(LIBS = [
+                'LLVMX86Disassembler', 'LLVMX86AsmParser',
+                'LLVMX86CodeGen', 'LLVMSelectionDAG', 'LLVMAsmPrinter',
+                'LLVMDebugInfoCodeView', 'LLVMCodeGen',
+                'LLVMScalarOpts', 'LLVMInstCombine',
+                'LLVMTransformUtils',
+                'LLVMBitWriter', 'LLVMX86Desc',
+                'LLVMMCDisassembler', 'LLVMX86Info',
+                'LLVMX86Utils',
+                'LLVMMCJIT', 'LLVMExecutionEngine', 'LLVMTarget',
+                'LLVMAnalysis', 'LLVMProfileData',
+                'LLVMRuntimeDyld', 'LLVMObject', 'LLVMMCParser',
+                'LLVMBitReader', 'LLVMMC', 'LLVMCore',
+                'LLVMSupport',
+                'LLVMIRReader', 'LLVMAsmParser',
+                'LLVMDemangle', 'LLVMGlobalISel', 'LLVMDebugInfoMSF',
+                'LLVMBinaryFormat',
+                'LLVMRemarks', 'LLVMBitstreamReader', 'LLVMDebugInfoDWARF',
+                'LLVMAggressiveInstCombine','LLVMLinker', 'LLVMVectorize',
+                'LLVMInstrumentation', 'LLVMipo', 'LLVMCoroutines',
+                'LLVMCFGuard', 'LLVMTextAPI',
+            ])
+        elif llvm_version >= distutils.version.LooseVersion('9.0'):
             env.Prepend(LIBS = [
                 'LLVMX86Disassembler', 'LLVMX86AsmParser',
                 'LLVMX86CodeGen', 'LLVMSelectionDAG', 'LLVMAsmPrinter',