Skip to content

Commit 3e01f80

Browse files
author
Jeff Whitaker
committed
update
1 parent 3fd4356 commit 3e01f80

File tree

1 file changed

+2
-24
lines changed

1 file changed

+2
-24
lines changed

config.sh

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
export NO_CDL=1
77

88
# Compile libs for macOS 10.9 or later
9-
#export MACOSX_DEPLOYMENT_TARGET="10.9"
9+
export MACOSX_DEPLOYMENT_TARGET="10.9"
1010
export NETCDF_VERSION="4.8.1"
1111
export HDF5_VERSION="1.12.1"
1212
# old openssl, since building new version requires perl 5.10.0
@@ -36,35 +36,13 @@ function build_curl2 {
3636
touch curl-stamp
3737
}
3838

39-
function build_netcdf2 {
40-
if [ -e netcdf-stamp ]; then return; fi
41-
build_hdf5
42-
build_curl
43-
if [ $NETCDF_VERSION == "MASTER" ]; then
44-
git clone https://github.com/Unidata/netcdf-c
45-
cd netcdf-c
46-
autoreconf -i
47-
./configure --prefix=$BUILD_PREFIX --enable-dap \
48-
make -j4
49-
make install
50-
cd ..
51-
else
52-
fetch_unpack https://github.com/Unidata/netcdf-c/archive/v${NETCDF_VERSION}.tar.gz
53-
(cd netcdf-c-${NETCDF_VERSION} \
54-
&& ./configure --prefix=$BUILD_PREFIX --enable-dap \
55-
&& make -j4 \
56-
&& make install)
57-
fi
58-
touch netcdf-stamp
59-
}
60-
6139
function build_libs {
6240
build_hdf5
6341
build_curl2
6442
if [ -z "$IS_OSX" ] && [ $MB_ML_VER -eq 1 ]; then
6543
export CFLAGS="-std=gnu99 -Wl,-strip-all"
6644
fi
67-
build_netcdf2
45+
build_netcdf
6846
}
6947

7048
function run_tests {

0 commit comments

Comments
 (0)