summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark C. Miller <miller86@llnl.gov>2017-06-20 07:59:40 -0700
committerAdam J. Stewart <ajstewart426@gmail.com>2017-06-20 09:59:40 -0500
commitca9e6576db7bf80238bb4ef50a2b702395c5c7aa (patch)
tree694fbf3f7f3daf52542a263ca77c649b7e4ef1c3
parent229886aa8fa90a49b48f6bae30b5e383c65e1554 (diff)
downloadspack-ca9e6576db7bf80238bb4ef50a2b702395c5c7aa.tar.gz
spack-ca9e6576db7bf80238bb4ef50a2b702395c5c7aa.tar.bz2
spack-ca9e6576db7bf80238bb4ef50a2b702395c5c7aa.tar.xz
spack-ca9e6576db7bf80238bb4ef50a2b702395c5c7aa.zip
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
-rw-r--r--var/spack/repos/builtin/packages/veclibfort/package.py12
1 files changed, 10 insertions, 2 deletions
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')