Module: Mesa Branch: master Commit: 8841c2cda51d86eafb855295e61810627a0a8bfe URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8841c2cda51d86eafb855295e61810627a0a8bfe
Author: Jose Fonseca <[email protected]> Date: Fri Jun 1 19:57:31 2018 +0100 scons: Fix MinGW cross compilation with LLVM 5.0. LLVM 5.0 requires additional Win32 libraries, and MinGW with pthreads. Reviewed-by: Roland Scheidegger <[email protected]> --- scons/llvm.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scons/llvm.py b/scons/llvm.py index 79118be371..a34edfb4b6 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. _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
