diff options
| author | Bernhard Kaindl <43588962+bernhardkaindl@users.noreply.github.com> | 2022-11-22 15:13:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-22 07:13:56 -0700 |
| commit | bcc0fda4e243500872b67ba442e67bf6a900e93e (patch) | |
| tree | 0760dd1923134c6e41af11b4b0103d4673f13e12 | |
| parent | 69987fd32336034366cb8425ec2b1eef4f053abd (diff) | |
| download | spack-bcc0fda4e243500872b67ba442e67bf6a900e93e.tar.gz spack-bcc0fda4e243500872b67ba442e67bf6a900e93e.tar.bz2 spack-bcc0fda4e243500872b67ba442e67bf6a900e93e.tar.xz spack-bcc0fda4e243500872b67ba442e67bf6a900e93e.zip | |
berkeleygw: fix build (no change to attribute spec.compiler_flags) (#34019)
| -rw-r--r-- | var/spack/repos/builtin/packages/berkeleygw/package.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/berkeleygw/package.py b/var/spack/repos/builtin/packages/berkeleygw/package.py index afd6519af5..2752aed4ea 100644 --- a/var/spack/repos/builtin/packages/berkeleygw/package.py +++ b/var/spack/repos/builtin/packages/berkeleygw/package.py @@ -121,9 +121,11 @@ class Berkeleygw(MakefilePackage): if "+mpi" in spec: paraflags.append("-DMPI") + # We need to copy fflags in case we append to it (#34019): + fflags = spec.compiler_flags["fflags"][:] if "+openmp" in spec: paraflags.append("-DOMP") - spec.compiler_flags["fflags"].append(self.compiler.openmp_flag) + fflags.append(self.compiler.openmp_flag) buildopts.append("C_PARAFLAG=-DPARA") buildopts.append("PARAFLAG=%s" % " ".join(paraflags)) @@ -138,7 +140,7 @@ class Berkeleygw(MakefilePackage): buildopts.append("LINK=%s" % spec["mpi"].mpifc) buildopts.append("C_LINK=%s" % spec["mpi"].mpicxx) - buildopts.append("FOPTS=%s" % " ".join(spec.compiler_flags["fflags"])) + buildopts.append("FOPTS=%s" % " ".join(fflags)) buildopts.append("C_OPTS=%s" % " ".join(spec.compiler_flags["cflags"])) mathflags = [] @@ -163,7 +165,7 @@ class Berkeleygw(MakefilePackage): buildopts.append("CC_COMP=%s" % spec["mpi"].mpicxx) buildopts.append("BLACSDIR=%s" % spec["scalapack"].libs) buildopts.append("BLACS=%s" % spec["scalapack"].libs.ld_flags) - buildopts.append("FOPTS=%s" % " ".join(spec.compiler_flags["fflags"])) + buildopts.append("FOPTS=%s" % " ".join(fflags)) elif spec.satisfies("%gcc"): c_flags = "-std=c99" cxx_flags = "-std=c++0x" @@ -178,7 +180,7 @@ class Berkeleygw(MakefilePackage): buildopts.append("FCPP=cpp -C -nostdinc") buildopts.append("C_COMP=%s %s" % (spec["mpi"].mpicc, c_flags)) buildopts.append("CC_COMP=%s %s" % (spec["mpi"].mpicxx, cxx_flags)) - buildopts.append("FOPTS=%s" % " ".join(spec.compiler_flags["fflags"])) + buildopts.append("FOPTS=%s" % " ".join(fflags)) elif spec.satisfies("%fj"): c_flags = "-std=c99" cxx_flags = "-std=c++0x" @@ -189,9 +191,7 @@ class Berkeleygw(MakefilePackage): buildopts.append("FCPP=cpp -C -nostdinc") buildopts.append("C_COMP=%s %s" % (spec["mpi"].mpicc, c_flags)) buildopts.append("CC_COMP=%s %s" % (spec["mpi"].mpicxx, cxx_flags)) - buildopts.append( - "FOPTS=-Kfast -Knotemparraystack %s" % " ".join(spec.compiler_flags["fflags"]) - ) + buildopts.append("FOPTS=-Kfast -Knotemparraystack %s" % " ".join(fflags)) else: raise InstallError( "Spack does not yet have support for building " |