From: Jose Fonseca <jfonseca@vmware.com>
Date: Fri, 1 Jun 2018 18:57:31 +0000 (+0100)
Subject: scons: Fix MinGW cross compilation with LLVM 5.0.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8841c2cda51d86eafb855295e61810627a0a8bfe;p=mesa.git

scons: Fix MinGW cross compilation with LLVM 5.0.

LLVM 5.0 requires additional Win32 libraries, and MinGW with pthreads.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
---

diff --git a/scons/llvm.py b/scons/llvm.py
index 79118be371d..a34edfb4b67 100644
--- a/scons/llvm.py
+++ b/scons/llvm.py
@@ -123,6 +123,10 @@ def generate(env):
                 'LLVMDemangle', 'LLVMGlobalISel', 'LLVMDebugInfoMSF',
                 'LLVMBinaryFormat',
             ])
+            if env['platform'] == 'windows' and env['crosscompile']:
+                # LLVM 5.0 requires MinGW w/ pthreads due to use of std::thread and friends.
+                assert env['gcc']
+                env['CXX'] = env['CXX'] + '-posix'
         elif llvm_version >= distutils.version.LooseVersion('4.0'):
             env.Prepend(LIBS = [
                 'LLVMX86Disassembler', 'LLVMX86AsmParser',
@@ -211,8 +215,11 @@ def generate(env):
             'imagehlp',
             'psapi',
             'shell32',
-            'advapi32'
+            'advapi32',
+            'ole32',
+            'uuid',
         ])
+
         if env['msvc']:
             # Some of the LLVM C headers use the inline keyword without
             # defining it.