Merge branch 'master' of https://github.com/MacPython/netcdf4-python-wheels

Author: jswhit

config.sh

@@ -8,7 +8,7 @@ export NO_CDL=1
 # Compile libs for macOS 10.9 or later
 export MACOSX_DEPLOYMENT_TARGET="10.9"
 export NETCDF_VERSION="4.9.0"
-export HDF5_VERSION="1.12.1"
+export HDF5_VERSION="1.12.2"
 # old openssl, since building new version requires perl 5.10.0
 export OPENSSL_ROOT=openssl-1.0.2u
 export OPENSSL_HASH=ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16
@@ -116,8 +116,9 @@ function build_netcdf {
     #    && make install \
     #    && ls -l $HDF5_PLUGIN_PATH )
     # autotools build
-    if [[ ! -z "IS_OSX" ]]; then
-       if [[ ! -z "IS_OSX"  && "$PLAT" = "arm64" ]] && [[ "$CROSS_COMPILING" = "1" ]]; then
+    if [ -n "$IS_MACOS" ]; then
+       #if [[ ! -z "IS_OSX"  && "$PLAT" = "arm64" ]] && [[ "$CROSS_COMPILING" = "1" ]]; then
+       if [[ "$PLAT" = "arm64" ]] && [[ "$CROSS_COMPILING" = "1" ]]; then
           (cd netcdf-c-${NETCDF_VERSION} \
               && ./configure --prefix=$BUILD_PREFIX --enable-netcdf-4 --enable-shared --enable-dap \
               && make -j4 \