From d21aa1cc124a8f005c8d400637dc180e6ab85529 Mon Sep 17 00:00:00 2001 From: Stephen Herbener <32968781+srherbener@users.noreply.github.com> Date: Wed, 1 May 2024 16:41:30 -0600 Subject: [PATCH] Removed use of mpi wrappers for fms and mapl package.py scripts. These were causing (#43726) builds to fail on MacOS and CMake appears to handle the build fine without the mpi wrappers. --- var/spack/repos/builtin/packages/fms/package.py | 4 ---- var/spack/repos/builtin/packages/mapl/package.py | 6 +++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/var/spack/repos/builtin/packages/fms/package.py b/var/spack/repos/builtin/packages/fms/package.py index 4bfbe8426fd..95465966a56 100644 --- a/var/spack/repos/builtin/packages/fms/package.py +++ b/var/spack/repos/builtin/packages/fms/package.py @@ -112,8 +112,4 @@ def cmake_args(self): self.define_from_variant("USE_DEPRECATED_IO", "deprecated_io"), ] - args.append(self.define("CMAKE_C_COMPILER", self.spec["mpi"].mpicc)) - args.append(self.define("CMAKE_CXX_COMPILER", self.spec["mpi"].mpicxx)) - args.append(self.define("CMAKE_Fortran_COMPILER", self.spec["mpi"].mpifc)) - return args diff --git a/var/spack/repos/builtin/packages/mapl/package.py b/var/spack/repos/builtin/packages/mapl/package.py index 8317c0aa98e..b152dac753c 100644 --- a/var/spack/repos/builtin/packages/mapl/package.py +++ b/var/spack/repos/builtin/packages/mapl/package.py @@ -246,6 +246,9 @@ class Mapl(CMakePackage): depends_on("py-numpy", when="+f2py") depends_on("perl") + # when using apple-clang version 15.x or newer, need to use the llvm-openmp library + depends_on("llvm-openmp", when="%apple-clang@15:", type=("build", "run")) + def cmake_args(self): args = [ self.define_from_variant("BUILD_WITH_FLAP", "flap"), @@ -254,9 +257,6 @@ def cmake_args(self): self.define_from_variant("BUILD_SHARED_MAPL", "shared"), self.define_from_variant("USE_EXTDATA2G", "extdata2g"), self.define_from_variant("USE_F2PY", "f2py"), - "-DCMAKE_C_COMPILER=%s" % self.spec["mpi"].mpicc, - "-DCMAKE_CXX_COMPILER=%s" % self.spec["mpi"].mpicxx, - "-DCMAKE_Fortran_COMPILER=%s" % self.spec["mpi"].mpifc, ] if self.spec.satisfies("@2.22.0:"):