From c6777ddf743e1bfa215c3448cb6744f4274f71e4 Mon Sep 17 00:00:00 2001 From: Jean-Paul Pelteret Date: Fri, 7 Apr 2017 20:15:14 +0200 Subject: Update LLVM to version 4.0.0 (#3683) * Update LLVM to version 4.0.0 * Add arguments to prevent lldb, polly building when using ~ --- var/spack/repos/builtin/packages/llvm/package.py | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index 9879c4ee0b..398daefc8f 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -166,6 +166,21 @@ class Llvm(Package): 'libunwind': 'http://llvm.org/svn/llvm-project/libunwind/trunk', } }, + { + 'version': '4.0.0', + 'md5': 'ea9139a604be702454f6acf160b4f3a2', + 'resources': { + 'compiler-rt': '2ec11fb7df827b086341131c5d7f1814', + 'openmp': '3d06d2801dd4808f551a1a70068e01f5', + 'polly': 'f36e4e7cf872f8b3bbb9cdcddc5fd964', + 'libcxx': '4cf7df466e6f803ec4611ee410ff6781', + 'libcxxabi': '8b5d7b9bfcf7dec2dc901c8a6746f97c', + 'cfe': '756e17349fdc708c62974b883bf72d37', + 'clang-tools-extra': '99e711337ec3e9a8bb36e8dd62b2cd6e', + 'lldb': 'bd41ba7fcca55d2a554409bbccd34d2d', + 'libunwind': '0c3534eaa11c0cae33a1dcf5f36ce287', + } + }, { 'version': '3.9.1', 'md5': '3259018a7437e157f3642df80f1983ea', @@ -325,12 +340,16 @@ class Llvm(Package): if '+polly' in spec: cmake_args.append('-DLINK_POLLY_INTO_TOOLS:Bool=ON') else: - cmake_args.append('-DLLVM_EXTERNAL_POLLY_BUILD:Bool=OFF') + cmake_args.extend(['-DLLVM_EXTERNAL_POLLY_BUILD:Bool=OFF', + '-DLLVM_TOOL_POLLY_BUILD:Bool=OFF', + '-DLLVM_POLLY_BUILD:Bool=OFF', + '-DLLVM_POLLY_LINK_INTO_TOOLS:Bool=OFF']) if '+clang' not in spec: cmake_args.append('-DLLVM_EXTERNAL_CLANG_BUILD:Bool=OFF') if '+lldb' not in spec: - cmake_args.append('-DLLVM_EXTERNAL_LLDB_BUILD:Bool=OFF') + cmake_args.extend(['-DLLVM_EXTERNAL_LLDB_BUILD:Bool=OFF', + '-DLLVM_TOOL_LLDB_BUILD:Bool=OFF']) if '+internal_unwind' not in spec: cmake_args.append('-DLLVM_EXTERNAL_LIBUNWIND_BUILD:Bool=OFF') if '+libcxx' not in spec: -- cgit v1.2.3-70-g09d2