diff options
| author | Cameron Smith <cwsmith@users.noreply.github.com> | 2023-02-06 08:35:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-06 14:35:44 +0100 |
| commit | e08da4e2b601d284a48ed14cf313e854a32abfaf (patch) | |
| tree | 060f388fc7914ab7590a9e0680b4184476f4f7c6 /var | |
| parent | 75a72766ff0f08df37a462749a7e8e5dca594a70 (diff) | |
| download | spack-e08da4e2b601d284a48ed14cf313e854a32abfaf.tar.gz spack-e08da4e2b601d284a48ed14cf313e854a32abfaf.tar.bz2 spack-e08da4e2b601d284a48ed14cf313e854a32abfaf.tar.xz spack-e08da4e2b601d284a48ed14cf313e854a32abfaf.zip | |
pumi and zoltan: allow building when no fortran compiler is available (#35333)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/pumi/package.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/zoltan/package.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/pumi/package.py b/var/spack/repos/builtin/packages/pumi/package.py index d2bc0ae9b5..ee88224e21 100644 --- a/var/spack/repos/builtin/packages/pumi/package.py +++ b/var/spack/repos/builtin/packages/pumi/package.py @@ -84,7 +84,6 @@ class Pumi(CMakePackage): "-DCMAKE_C_COMPILER=%s" % spec["mpi"].mpicc, "-DCMAKE_CXX_COMPILER=%s" % spec["mpi"].mpicxx, self.define_from_variant("BUILD_SHARED_LIBS", "shared"), - "-DCMAKE_Fortran_COMPILER=%s" % spec["mpi"].mpifc, self.define_from_variant("PUMI_FORTRAN_INTERFACE", "fortran"), "-DMDS_ID_TYPE=%s" % ("long" if "+int64" in spec else "int"), "-DSKIP_SIMMETRIX_VERSION_CHECK=%s" @@ -92,6 +91,8 @@ class Pumi(CMakePackage): self.define_from_variant("IS_TESTING", "testing"), "-DMESHES=%s" % join_path(self.stage.source_path, "pumi-meshes"), ] + if spec.satisfies("fortran"): + args += ["-DCMAKE_Fortran_COMPILER=%s" % spec["mpi"].mpifc] if spec.satisfies("@2.2.3"): args += ["-DCMAKE_CXX_STANDARD=11"] if self.spec.satisfies("simmodsuite=base"): diff --git a/var/spack/repos/builtin/packages/zoltan/package.py b/var/spack/repos/builtin/packages/zoltan/package.py index dcb0ba8397..9af9503b48 100644 --- a/var/spack/repos/builtin/packages/zoltan/package.py +++ b/var/spack/repos/builtin/packages/zoltan/package.py @@ -132,7 +132,6 @@ class Zoltan(AutotoolsPackage): [ "CC={0}".format(spec["mpi"].mpicc), "CXX={0}".format(spec["mpi"].mpicxx), - "FC={0}".format(spec["mpi"].mpifc), "--with-mpi={0}".format(spec["mpi"].prefix), # NOTE: Zoltan assumes that it's linking against an MPI library # that can be found with '-lmpi' which isn't the case for many @@ -142,6 +141,8 @@ class Zoltan(AutotoolsPackage): "--with-mpi-libs= ", ] ) + if "+fortran" in spec: + config_args.extend(["FC={0}".format(spec["mpi"].mpifc)]) config_fcflags = config_cflags[:] if spec.satisfies("%gcc@10:+fortran"): |