Merge pull request #84 from BenWibking/bigsur-makefile

macOS Big Sur makefile

src/clib/Make.mach.darwin

@@ -2,13 +2,10 @@
 #
 # FILE:        Make.mach.darwin
 #
-# DESCRIPTION: Makefile settings for OSX
+# DESCRIPTION: Makefile settings for macOS 11+
 #  This was written to use:
-#       System OpenMPI (mpicc, mpic++)
-#       HDF5 installed to /usr/local/ with no additional 'configure'
-#           arguments
-#       gfortran from http://r.research.att.com/gfortran-4.2.3.dmg
-#
+#       HDF5 installed with Homebrew (https://brew.sh/)
+#       gcc/g++/gfortran installed with Homebrew
 #
 # AUTHOR:      Matthew Turk (mturk@slac.stanford.edu)
 #              David Collins (dcollins4096@gmail.com)
@@ -20,9 +17,12 @@
 #         Updated fortran flags to reperesent change.
 #         Changed suggested gfortran, hpc.sf.net version only build for i386.  
 #
+# Update: 2021-04-08
+#	  (Ben Wibking) Use Homebrew instead of old versions of gfortran/gcc.
+#
 #=======================================================================
 
-MACH_TEXT  = Darwin (OSX) 
+MACH_TEXT  = Darwin (macOS)
 MACH_VALID = 1
 MACH_FILE  = Make.mach.darwin
 
@@ -37,8 +37,8 @@ MACH_FILE  = Make.mach.darwin
 
 LOCAL_PACKAGES       = /usr/local
 
-LOCAL_FC_INSTALL     = /usr/local
-LOCAL_HDF5_INSTALL   = /usr/local/hdf5
+LOCAL_FC_INSTALL     = /usr/local/Cellar/gcc/10.2.0_4/lib/gcc/10
+LOCAL_HDF5_INSTALL   = /usr/local/Cellar/hdf5/1.12.0_1
 LOCAL_SZIP_INSTALL   = $(LOCAL_PACKAGES)
 
 #-----------------------------------------------------------------------
@@ -47,11 +47,11 @@ LOCAL_SZIP_INSTALL   = $(LOCAL_PACKAGES)
 
 MACH_CPP       = /usr/bin/cpp
 
-MACH_CC_NOMPI  = gcc  # C compiler when not using MPI
-MACH_CXX_NOMPI = g++ # C++ compiler when not using MPI
+MACH_CC_NOMPI  = gcc-10  # C compiler when not using MPI
+MACH_CXX_NOMPI = g++-10 # C++ compiler when not using MPI
 MACH_FC_NOMPI  = gfortran # Fortran 77 compiler when not using MPI
 MACH_F90_NOMPI = gfortran # Fortran 90 compiler when not using MPI
-MACH_LD_NOMPI  = gcc # Linker when not using MPI
+MACH_LD_NOMPI  = gcc-10 # Linker when not using MPI
 
 MACH_LIBTOOL   = glibtool
 
@@ -98,7 +98,7 @@ MACH_INCLUDES         = $(LOCAL_INCLUDES_HDF5)
 # Libraries
 #-----------------------------------------------------------------------
 
-LOCAL_LIBS_MACH   = -L$(LOCAL_FC_INSTALL)/lib -lgfortran 
+LOCAL_LIBS_MACH   = -L$(LOCAL_FC_INSTALL) -lgfortran 
 LOCAL_LIBS_HDF5   = -L$(LOCAL_HDF5_INSTALL)/lib -lhdf5
 
 MACH_LIBS        = $(LOCAL_LIBS_HDF5) $(LOCAL_LIBS_MACH) 
@@ -107,6 +107,6 @@ MACH_LIBS        = $(LOCAL_LIBS_HDF5) $(LOCAL_LIBS_MACH)
 # Installation
 #-----------------------------------------------------------------------
 
-MACH_INSTALL_PREFIX = $(HOME)/local
+MACH_INSTALL_PREFIX = $(HOME)/grackle_install
 MACH_INSTALL_LIB_DIR =
 MACH_INSTALL_INCLUDE_DIR =