From 6ff16ca6610b2e08f1e5ffecec192d73eba1eeca Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Thu, 9 Jun 2022 22:50:30 -0600 Subject: [PATCH] Fix automatic choice of compiler and MPI for OSX Previously, there was confusion between just "clang" and "gfortran-clang" as the compiler choice. Now, we just stick with "clang" everywhere (with the understanding that gfortran is still used as the Fortran compiler) --- compass/machines/conda-osx.cfg | 2 +- conda/bootstrap.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compass/machines/conda-osx.cfg b/compass/machines/conda-osx.cfg index 65b91c7583..f6a859c719 100644 --- a/compass/machines/conda-osx.cfg +++ b/compass/machines/conda-osx.cfg @@ -6,4 +6,4 @@ compiler = clang # the system MPI library to use for gnu compiler -mpi_gnu = mpich +mpi_clang = mpich diff --git a/conda/bootstrap.py b/conda/bootstrap.py index 03f4484a87..8e6c39415c 100755 --- a/conda/bootstrap.py +++ b/conda/bootstrap.py @@ -67,7 +67,7 @@ def get_compilers_mpis(config, machine, compilers, mpis, source_path): all_compilers = ['gfortran'] all_mpis = ['mpich', 'openmpi'] elif machine == 'conda-osx': - all_compilers = ['gfortran-clang'] + all_compilers = ['clang'] all_mpis = ['mpich', 'openmpi'] else: machine_info = MachineInfo(machine)