[Mesa-stable] [PATCH] scons: update for LLVM 4.0

[Andres Gomez]

Hi Ben,

Commenting for confirmation, since this is only tagged with:

CC: <mesa-stable at lists.freedesktop.org>

I'm not picking this for 17.0 since the changes that need LLVM 4.0 are
only getting into 17.1 and beyond, and because, IMHO, it doesn't make
sense to increase the version of a dependency in a stable release.

I hope that's OK with you.

Br.

On Thu, 2017-04-27 at 16:16 -0400, Ben Boeckel wrote:
> LLVMDemangle, LLVMGlobalISel, and LLVMDebugInfoMSF are new.
> 
> Also update the comment to add irreader to the list of components.
> 
> CC: <mesa-stable at lists.freedesktop.org>
> Reviewed-by: Chuck Atkins <chuck.atkins at kitware.com>
> Signed-off-by: Ben Boeckel <ben.boeckel at kitware.com>
> ---
>  scons/llvm.py | 22 ++++++++++++++++++++--
>  1 file changed, 20 insertions(+), 2 deletions(-)
> 
> diff --git a/scons/llvm.py b/scons/llvm.py
> index 2d0f05b..2338f78 100644
> --- a/scons/llvm.py
> +++ b/scons/llvm.py
> @@ -105,8 +105,26 @@ def generate(env):
>              'HAVE_STDINT_H',
>          ])
>          env.Prepend(LIBPATH = [os.path.join(llvm_dir, 'lib')])
> -        # LIBS should match the output of `llvm-config --libs engine mcjit bitwriter x86asmprinter`
> -        if llvm_version >= distutils.version.LooseVersion('3.9'):
> +        # LIBS should match the output of `llvm-config --libs engine mcjit bitwriter x86asmprinter irreader`
> +        if llvm_version >= distutils.version.LooseVersion('4.0'):
> +            env.Prepend(LIBS = [
> +                'LLVMX86Disassembler', 'LLVMX86AsmParser',
> +                'LLVMX86CodeGen', 'LLVMSelectionDAG', 'LLVMAsmPrinter',
> +                'LLVMDebugInfoCodeView', 'LLVMCodeGen',
> +                'LLVMScalarOpts', 'LLVMInstCombine',
> +                'LLVMTransformUtils',
> +                'LLVMBitWriter', 'LLVMX86Desc',
> +                'LLVMMCDisassembler', 'LLVMX86Info',
> +                'LLVMX86AsmPrinter', 'LLVMX86Utils',
> +                'LLVMMCJIT', 'LLVMExecutionEngine', 'LLVMTarget',
> +                'LLVMAnalysis', 'LLVMProfileData',
> +                'LLVMRuntimeDyld', 'LLVMObject', 'LLVMMCParser',
> +                'LLVMBitReader', 'LLVMMC', 'LLVMCore',
> +                'LLVMSupport',
> +                'LLVMIRReader', 'LLVMAsmParser'
> +                'LLVMDemangle', 'LLVMGlobalISel', 'LLVMDebugInfoMSF',
> +            ])
> +        elif llvm_version >= distutils.version.LooseVersion('3.9'):
>              env.Prepend(LIBS = [
>                  'LLVMX86Disassembler', 'LLVMX86AsmParser',
>                  'LLVMX86CodeGen', 'LLVMSelectionDAG', 'LLVMAsmPrinter',
-- 
Br,

Andres