[Mesa-dev] [PATCH 3/3] scons: Fix MinGW cross compilation with LLVM 5.0.

[Roland Scheidegger]

Looks good to me.
Reviewed-by: Roland Scheidegger <sroland at vmware.com>

Am 01.06.2018 um 20:58 schrieb Jose Fonseca:
> LLVM 5.0 requires additional Win32 libraries, and MinGW with pthreads.
> ---
>  scons/llvm.py | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
> 
> 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.
>