From ca9e6576db7bf80238bb4ef50a2b702395c5c7aa Mon Sep 17 00:00:00 2001 From: "Mark C. Miller" Date: Tue, 20 Jun 2017 07:59:40 -0700 Subject: Fix veclibfort for gcc (#4548) * fixes #967 * Version bump to 0.9.1 - Bugfixes for spack find - 0.9.1 can read specs from current develop. * Don't assume spack is in the path when building docs. * fixing Makefile override of PREFIX and install w/gcc-6 --- var/spack/repos/builtin/packages/veclibfort/package.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/veclibfort/package.py b/var/spack/repos/builtin/packages/veclibfort/package.py index 4a056803ca..c02299d97c 100644 --- a/var/spack/repos/builtin/packages/veclibfort/package.py +++ b/var/spack/repos/builtin/packages/veclibfort/package.py @@ -55,8 +55,16 @@ class Veclibfort(Package): if sys.platform != 'darwin': raise InstallError('vecLibFort can be installed on macOS only') - make('all') - make('PREFIX=%s' % prefix, 'install') + filter_file(r'^PREFIX=.*', '', 'Makefile') + + make_args = [] + + if spec.satisfies('%gcc@6:'): + make_args += ['CFLAGS=-flax-vector-conversions'] + + make_args += ['PREFIX=%s' % prefix, 'install'] + + make(*make_args) # test fc = which('fc') -- cgit v1.2.3-60-g2f50