Mesa (master): scons/windows: Fix build with LLVM>=8

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 0fe2e04f2d8e95ac6163ffa9e78e82d83aeb02e9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0fe2e04f2d8e95ac6163ffa9e78e82d83aeb02e9

Author: Prodea Alexandru-Liviu <liviuprodea at yahoo.com>
Date:   Fri Oct  4 13:48:08 2019 +0000

scons/windows: Fix build with LLVM>=8

Fixes eebe091d292609de8aaf5b5c537d867b23908947
("scons/windows: Enable compute shaders when possible.")
Signed-off-by: Prodea Alexandru-Liviu <liviuprodea at yahoo.com>
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>

---

 scons/llvm.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/scons/llvm.py b/scons/llvm.py
index 061295d1d79..6d04bd55522 100644
--- a/scons/llvm.py
+++ b/scons/llvm.py
@@ -109,7 +109,8 @@ def generate(env):
 
         # LIBS should match the output of `llvm-config --libs engine mcjit bitwriter x86asmprinter irreader` for LLVM<=7.0
         # and `llvm-config --libs engine coroutines` for LLVM>=8.0
-        # LLVMAggressiveInstCombine library part of engine component can be safely omitted as it's not used.
+        # 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'):
             env.Prepend(LIBS = [
                 'LLVMX86Disassembler', 'LLVMX86AsmParser',
@@ -130,8 +131,8 @@ def generate(env):
                 'LLVMBinaryFormat',
                 'LLVMRemarks', 'LLVMBitstreamReader', 'LLVMDebugInfoDWARF',
                 # Add these libraries to enable ompute shaders support.
-                'LLVMLinker', 'LLVMVectorize', 'LLVMInstrumentation',
-                'LLVMipo', 'LLVMCoroutines',
+                'LLVMAggressiveInstCombine','LLVMLinker', 'LLVMVectorize',
+                'LLVMInstrumentation', 'LLVMipo', 'LLVMCoroutines',
             ])
         elif llvm_version >= distutils.version.LooseVersion('8.0'):
             env.Prepend(LIBS = [
@@ -152,8 +153,8 @@ def generate(env):
                 'LLVMDemangle', 'LLVMGlobalISel', 'LLVMDebugInfoMSF',
                 'LLVMBinaryFormat',
                 # Add these libraries to enable ompute shaders support.
-                'LLVMLinker', 'LLVMVectorize', 'LLVMInstrumentation',
-                'LLVMipo', 'LLVMCoroutines',
+                'LLVMAggressiveInstCombine', 'LLVMLinker', 'LLVMVectorize',
+                'LLVMInstrumentation', 'LLVMipo', 'LLVMCoroutines',
             ])
         elif llvm_version >= distutils.version.LooseVersion('5.0'):
             env.Prepend(LIBS = [