summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authoriarspider <iarspider@gmail.com>2021-03-12 18:52:07 +0100
committerGitHub <noreply@github.com>2021-03-12 09:52:07 -0800
commitb2ece3abba4371ca3362a3b9a2e67c0484c45a27 (patch)
tree2b2cea8b33cc0c064572eaacdd2cbd486382f8dd /var
parent24b7aff83744464d41394140ee07e0e7a676f1ed (diff)
downloadspack-b2ece3abba4371ca3362a3b9a2e67c0484c45a27.tar.gz
spack-b2ece3abba4371ca3362a3b9a2e67c0484c45a27.tar.bz2
spack-b2ece3abba4371ca3362a3b9a2e67c0484c45a27.tar.xz
spack-b2ece3abba4371ca3362a3b9a2e67c0484c45a27.zip
Rivet: syntax fixes (#22225)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/rivet/package.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/rivet/package.py b/var/spack/repos/builtin/packages/rivet/package.py
index 00dea83e64..12ccf1fea1 100644
--- a/var/spack/repos/builtin/packages/rivet/package.py
+++ b/var/spack/repos/builtin/packages/rivet/package.py
@@ -155,16 +155,15 @@ class Rivet(AutotoolsPackage):
fjcontrib_home = self.spec['fjcontrib'].prefix
env.prepend_path('LD_LIBRARY_PATH', fjcontrib_home.lib)
- @when('@3.1.2:')
def flag_handler(self, name, flags):
- if name == 'cxxflags':
+ if self.spec.satisfies('@3.1.2:') and name == 'cxxflags':
flags.append('-faligned-new')
return (None, None, flags)
return (flags, None, None)
def configure_args(self):
args = []
- if self.spec.variants['hepmc'] == '2':
+ if self.spec.variants['hepmc'].value == '2':
args += ['--with-hepmc=' + self.spec['hepmc'].prefix]
else:
args += ['--with-hepmc3=' + self.spec['hepmc'].prefix]