File tree Expand file tree Collapse file tree 1 file changed +4
-6
lines changed Expand file tree Collapse file tree 1 file changed +4
-6
lines changed Original file line number Diff line number Diff line change @@ -108,21 +108,19 @@ function build_netcdf {
108
108
# && ls -l $HDF5_PLUGIN_PATH )
109
109
# autotools build
110
110
if [[ ! -z " IS_OSX" && " $PLAT " = " arm64" ]] && [[ " $CROSS_COMPILING " = " 1" ]]; then
111
+ unset NETCDF_PLUGIN_DIR
111
112
(cd netcdf-c-${NETCDF_VERSION} \
112
- && export HDF5_PLUGIN_PATH=$BUILD_PREFIX /lib/netcdf-plugins \
113
113
&& ./configure --prefix=$BUILD_PREFIX --enable-netcdf-4 --enable-shared --enable-dap --disable-plugins \
114
114
&& make -j4 \
115
115
&& make install )
116
116
else
117
+ set +e
117
118
(cd netcdf-c-${NETCDF_VERSION} \
118
119
&& export HDF5_PLUGIN_PATH=$BUILD_PREFIX /lib/netcdf-plugins \
119
- && set +e \
120
120
&& ./configure --prefix=$BUILD_PREFIX --enable-netcdf-4 --enable-shared --enable-dap --with-plugin-dir=$HDF5_PLUGIN_PATH \
121
- && cat config.log \
122
- && set -e \
123
121
&& make -j4 \
124
- && make install \
125
- && ls -l $HDF5_PLUGIN_PATH )
122
+ && make install )
123
+ cat netcdf-c- ${NETCDF_VERSION} /config.log
126
124
fi
127
125
touch netcdf-stamp
128
126
}
You can’t perform that action at this time.
0 commit comments