More improvements to build scripts for Mac

buildscripts/_build_getopts.sh

@@ -17,7 +17,7 @@ ROOT_DIR=$(realpath ${SCRIPT_DIR}/..)
 USTMT="Usage: ${0} <-d /path/to/dependency/source> [-p /prefix/path|{/usr/local}] [-m MACOSX_DEPLOYMENT_TARGET|{11.0}]"
 PREFIX=/usr/local
 DEPENDENCY_DIR="${ROOT_DIR}/_dependencies"
-MACOSX_DEPLOYMENT_TARGET="11.0"
+MACOSX_DEPLOYMENT_TARGET="13.0"
 while getopts ":d:p:m:h" ARG; do
     case "${ARG}" in
     d)
@@ -46,17 +46,6 @@ while getopts ":d:p:m:h" ARG; do
 done
 
 read -r OS ARCH < <($SCRIPT_DIR/get_platform.sh)
-case $OS in
-    MacOSX) 
-        COMPILER="GNU-Mac"
-        ;;
-    Linux)
-        COMPILER="GNU-Linux"
-        ;;
-    *)
-        printf "This script is not tested for ${OS}-${ARCH}\n"
-        ;;
-esac 
 
 if [ -z ${DEPENDENCY_ENV_VARS+x} ]; then
     . ${SCRIPT_DIR}/set_compilers.sh 

buildscripts/build_dependencies.sh

@@ -63,7 +63,7 @@ cd $ROOT_DIR
 printf "*********************************************************\n"
 printf "*          STARTING DEPENDENCY BUILD                    *\n"
 printf "*********************************************************\n"
-printf "Using ${COMPILER} compilers:\nFC: ${FC}\nCC: ${CC}\nCXX: ${CXX}\n"
+printf "Using ${OS} compilers:\nFC: ${FC}\nCC: ${CC}\nCXX: ${CXX}\n"
 printf "Installing to ${PREFIX}\n"
 printf "\n"
 

buildscripts/build_hdf5.sh

@@ -28,7 +28,7 @@ printf "LDFLAGS: ${LDFLAGS}\n"
 printf "*********************************************************\n"
 
 cd ${DEPENDENCY_DIR}/hdfsrc
-if [ $COMPILER = "GNU-Mac" ]; then
+if [ $OS = "MacOSX" ]; then
    read -r OS ARCH < <($SCRIPT_DIR/get_platform.sh)
    if [ $ARCH  = "arm64" ]; then
       printf "Manually setting bin/config.sub to arm-apple-darwin\n"

buildscripts/build_netcdf-c.sh

@@ -31,7 +31,7 @@ printf "*********************************************************\n"
 
 cd ${DEPENDENCY_DIR}/netcdf-c-*
 COPTS="--disable-shared --disable-dap --disable-byterange --disable-testsets --prefix=${PREFIX}"
-if [ !  $COMPILER = "GNU-Mac" ]; then
+if [ !  $OS = "MacOSX" ]; then
     COPTS="${COPTS} --disable-libxml2"
 fi
 printf "COPTS: ${COPTS}\n"

buildscripts/build_swiftest.sh

@@ -21,14 +21,14 @@ if [ ! -f "${ROOT_DIR}/setup.py" ]; then
     exit 1
 fi
 
-printf "Using ${COMPILER} compilers:\nFC: ${FC}\nCC: ${CC}\nCXX: ${CXX}\n\n"
+printf "Using ${OS} compilers:\nFC: ${FC}\nCC: ${CC}\nCXX: ${CXX}\n\n"
 printf "Installing to ${PREFIX}\n"
 printf "Dependency libraries in ${PREFIX}\n"
 
 
 SKBUILD_CONFIGURE_OPTIONS="-DBUILD_SHARED_LIBS=OFF"
 
-if [ $COMPILER = "Intel" ]; then 
+if [ $OS = "Intel" ]; then 
     FCFLAGS="${CFLAGS} -standard-semantics"
     FFLAGS=${CFLAGS}
     SKBUILD_CONFIGURE_OPTIONS="${SKBUILD_CONFIGURE_OPTIONS} -DMACHINE_CODE_VALUE=\"SSE2\""

buildscripts/set_compilers.sh

@@ -14,20 +14,20 @@
 # You should have received a copy of the GNU General Public License along with Swiftest. 
 # If not, see: https://www.gnu.org/licenses. 
 # Parse arguments
-case "$COMPILER" in
-    Intel|GNU-Linux|GNU-Mac)
+case "$OS" in
+    Intel|Linux|MacOSX)
         ;;
     *)
-        echo "Unknown compiler type: $COMPILER"
-        echo "Valid options are Intel, GNU-Linux, or GNU-Mac"
+        echo "Unknown compiler type: $OS"
+        echo "Valid options are Intel, Linux, or MacOSX"
         echo $USTMT
         exit 1
         ;;
 esac
 
 set -a
 # Only replace compiler definitions if they are not already set
-case $COMPILER in
+case $OS in
     Intel)
         if [ ! -v FC ]; then
             if command -v ifx &> /dev/null; then
@@ -82,13 +82,13 @@ case $COMPILER in
 
         CPP=${CPP:-$HOMEBRE_PREFIX/bin/cpp-13}
         ;;
-    GNU-Linux)
+    Linux)
         FC=${FC:-$(command -v gfortran)}
         CC=${CC:-$(command -v gcc)}
         CXX=${CXX:-$(command -v g++)}
         CPP=${CPP:-$(command -v cpp)}
         ;;
-    GNU-Mac)
+    MacOSX)
 
         if $(brew --version &> /dev/null); then 
             brew install llvm@16 libomp 
@@ -106,17 +106,18 @@ case $COMPILER in
         FROOT=$(realpath $(dirname $(command -v gfortran))/..) 
         FC=$(command -v gfortran)
         LD_LIBRARY_PATH="${COMPILER_PREFIX}/lib:${FROOT}/lib:${LD_LIBRARY_PATH}"
-        LDFLAGS="-L${HOMEBREW_PREFIX}/opt/llvm/lib/c++ -Wl,-rpath,${HOMEBREW_PREFIX}/opt/llvm/lib/c+ -L${HOMEBREW_PREFIX}/opt/libomp/lib"
+        LDFLAGS="-L${HOMEBREW_PREFIX}/opt/llvm/lib/c++ -Wl,-rpath,${HOMEBREW_PREFIX}/opt/llvm/lib/c+ -L${HOMEBREW_PREFIX}/opt/libomp/lib -Wl,-no_compact_unwind"
         CPPFLAGS="-isystem ${HOMEBREW_PREFIX}/opt/libomp/include"
         LIBS="-lomp ${LIBS}"
         CPATH="${FROOT}/include:${CPATH}"
-        CFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET} ${CFLAGS}"
         CXXFLAGS="${CFLAGS} ${CXXFLAGS}"
         FCFLAGS="${CFLAGS} ${FCFLAGS}"
+        CFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET} ${CFLAGS} -Wno-deprecated-non-prototype"
+    fi
         ;;
     *)
-        printf "Unknown compiler type: ${COMPILER}\n"
-        echo "Valid options are Intel, GNU-Linux, or GNU-Mac"
+        printf "Unknown compiler type: ${OS}\n"
+        echo "Valid options are Intel, Linux, or MacOSX"
         printf $USTMT
         exit 1
         ;;