diff options
Diffstat (limited to 'var/spack/repos/builtin/packages/charmpp/package.py')
| -rw-r--r-- | var/spack/repos/builtin/packages/charmpp/package.py | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/charmpp/package.py b/var/spack/repos/builtin/packages/charmpp/package.py index 0100be6dc1..b6522f003c 100644 --- a/var/spack/repos/builtin/packages/charmpp/package.py +++ b/var/spack/repos/builtin/packages/charmpp/package.py @@ -43,6 +43,10 @@ class Charmpp(Package): # Patch is no longer needed in versions 6.8.0+ patch("mpi.patch", when="@:6.7.1") + # Patch for AOCC + patch('charm_6.7.1_aocc.patch', when="@6.7.1 %aocc", level=1) + patch('charm_6.8.2_aocc.patch', when="@6.8.2 %aocc", level=3) + # support Fujitsu compiler patch("fj.patch", when="%fj") @@ -236,12 +240,15 @@ class Charmpp(Package): # not, then we need to query the compiler vendor from Spack # here. options = [ - os.path.basename(self.compiler.cc), - os.path.basename(self.compiler.fc), - "-j%d" % make_jobs, - "--destination=%s" % builddir, + os.path.basename(self.compiler.cc) ] + if '@:6.8.2 %aocc' not in spec: + options.append(os.path.basename(self.compiler.fc)) + + options.append("-j%d" % make_jobs) + options.append("--destination=%s" % builddir) + if "pmi=slurmpmi" in spec: options.append("slurmpmi") if "pmi=slurmpmi2" in spec: |