From a05bbd71046629cbce9b18a7c00ed38ddeca37b8 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Thu, 26 Oct 2017 01:34:33 -0600 Subject: flang: fixed llvm dep (#5948) * flang: fixed llvm dep * add support for llvm-5 * Update package.py * Update package.py --- var/spack/repos/builtin/packages/flang/package.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/flang/package.py b/var/spack/repos/builtin/packages/flang/package.py index 6e1419a03a..b4b9a24e1f 100644 --- a/var/spack/repos/builtin/packages/flang/package.py +++ b/var/spack/repos/builtin/packages/flang/package.py @@ -35,10 +35,16 @@ class Flang(CMakePackage): version('develop', git='https://github.com/flang-compiler/flang', branch='master') depends_on( - "llvm+clang", - patches=patch('https://github.com/llvm-mirror/clang/pull/33.diff', + "llvm+clang@4.0.1,5.0.0", + patches=[ + patch('https://github.com/llvm-mirror/clang/pull/33.diff', sha256='e46d7ab305e5e95c51f4656d9b52058143cd85d859b312b3c80e93a02d54b4a5', - when='@4.0.1', level=1, working_dir='tools/clang')) + when='@4.0.1', level=1, working_dir='tools/clang'), + patch('https://github.com/llvm-mirror/clang/pull/35.diff', + sha256='7f39555783993f78b75c380ca5ef167c1d8b88cc75c6542f6c94e0b6acfb7c5d', + when='@5.0', level=1, working_dir='tools/clang') + ] + ) def cmake_args(self): options = [ -- cgit v1.2.3-70-g09d2