Skip to content

Commit e52da54

Browse files
committed
update
1 parent 567c543 commit e52da54

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

config.sh

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,21 +108,19 @@ function build_netcdf {
108108
# && ls -l $HDF5_PLUGIN_PATH )
109109
# autotools build
110110
if [[ ! -z "IS_OSX" && "$PLAT" = "arm64" ]] && [[ "$CROSS_COMPILING" = "1" ]]; then
111+
unset NETCDF_PLUGIN_DIR
111112
(cd netcdf-c-${NETCDF_VERSION} \
112-
&& export HDF5_PLUGIN_PATH=$BUILD_PREFIX/lib/netcdf-plugins \
113113
&& ./configure --prefix=$BUILD_PREFIX --enable-netcdf-4 --enable-shared --enable-dap --disable-plugins \
114114
&& make -j4 \
115115
&& make install )
116116
else
117+
set +e
117118
(cd netcdf-c-${NETCDF_VERSION} \
118119
&& export HDF5_PLUGIN_PATH=$BUILD_PREFIX/lib/netcdf-plugins \
119-
&& set +e \
120120
&& ./configure --prefix=$BUILD_PREFIX --enable-netcdf-4 --enable-shared --enable-dap --with-plugin-dir=$HDF5_PLUGIN_PATH \
121-
&& cat config.log \
122-
&& set -e \
123121
&& make -j4 \
124-
&& make install \
125-
&& ls -l $HDF5_PLUGIN_PATH )
122+
&& make install )
123+
cat netcdf-c-${NETCDF_VERSION}/config.log
126124
fi
127125
touch netcdf-stamp
128126
}

0 commit comments

Comments
 (0)