diff --git a/package/pnetcdf/1.11.2/install.sh b/package/pnetcdf/1.11.2/install.sh index 130bb99271d830546f08691ba7746c0eb5096483..113600414e03af619e9cc196984e6963539ff201 100755 --- a/package/pnetcdf/1.11.2/install.sh +++ b/package/pnetcdf/1.11.2/install.sh @@ -9,9 +9,8 @@ rm -rf pnetcdf-${pnetcdf_ver} tar zxvf ${JARVIS_DOWNLOAD}/pnetcdf-${pnetcdf_ver}.tar.gz cd pnetcdf-${pnetcdf_ver} use_gcc=0 -which_mpicc=`which mpicc 2> /dev/null 1> /dev/null` -which_ret=$? -if [ "$which_ret" -eq "0" ]; then +which mpicc 2> /dev/null 1> /dev/null +if [ "$?" -eq "0" ]; then if [ "`mpicc --version | grep gcc`" ]; then use_gcc=1 fi @@ -19,7 +18,7 @@ fi FFLAGS="" FCFLAGS="" if [ "$use_gcc" -eq "1" ]; then - if [ "`$CC --version | grep gcc | grep -oP \"\)\s*\K[0-9]+(?=\.)\"`" -ge '10' ]; then + if [ "`mpicc --version | grep gcc | grep -oP \"\)\s*\K[0-9]+(?=\.)\"`" -ge '10' ]; then FFLAGS="-fallow-argument-mismatch" FCFLAGS="-fallow-argument-mismatch" fi diff --git a/package/pnetcdf/1.12.1/install.sh b/package/pnetcdf/1.12.1/install.sh index 997edbeaa0c89f28bf28a2a51056b2089bd2435e..df66345f4e56c804ff233a3fe07cead92e2c65c6 100755 --- a/package/pnetcdf/1.12.1/install.sh +++ b/package/pnetcdf/1.12.1/install.sh @@ -8,9 +8,8 @@ rm -rf pnetcdf-${pnetcdf_version} tar zxvf ${JARVIS_DOWNLOAD}/pnetcdf-${pnetcdf_version}.tar.gz cd pnetcdf-${pnetcdf_version} use_gcc=0 -which_mpicc=`which mpicc 2> /dev/null 1> /dev/null` -which_ret=$? -if [ "$which_ret" -eq "0" ]; then +which mpicc 2> /dev/null 1> /dev/null +if [ "$?" -eq "0" ]; then if [ "`mpicc --version | grep gcc`" ]; then use_gcc=1 fi @@ -18,7 +17,7 @@ fi FFLAGS="" FCFLAGS="" if [ "$use_gcc" -eq "1" ]; then - if [ "`$CC --version | grep gcc | grep -oP \"\)\s*\K[0-9]+(?=\.)\"`" -ge '10' ]; then + if [ "`mpicc --version | grep gcc | grep -oP \"\)\s*\K[0-9]+(?=\.)\"`" -ge '10' ]; then FFLAGS="-fallow-argument-mismatch" FCFLAGS="-fallow-argument-mismatch" fi diff --git a/package/pnetcdf/1.12.3/install.sh b/package/pnetcdf/1.12.3/install.sh index 7852f8e197a5bc43aba568510fdb2a06ef81d14b..40783e736d0c5bfd2ea77e8e2cf368bf6b61d8c3 100755 --- a/package/pnetcdf/1.12.3/install.sh +++ b/package/pnetcdf/1.12.3/install.sh @@ -7,9 +7,8 @@ cd ${JARVIS_TMP} tar zxvf ${JARVIS_DOWNLOAD}/pnetcdf-${pnetcdf_version}.tar.gz cd pnetcdf-${pnetcdf_version} use_gcc=0 -which_mpicc=`which mpicc 2> /dev/null 1> /dev/null` -which_ret=$? -if [ "$which_ret" -eq "0" ]; then +which mpicc 2> /dev/null 1> /dev/null +if [ "$?" -eq "0" ]; then if [ "`mpicc --version | grep gcc`" ]; then use_gcc=1 fi @@ -17,7 +16,7 @@ fi FFLAGS="-fPIC" FCFLAGS="-fPIC" if [ "$use_gcc" -eq "1" ]; then - if [ "`$CC --version | grep gcc | grep -oP \"\)\s*\K[0-9]+(?=\.)\"`" -ge '10' ]; then + if [ "`mpicc --version | grep gcc | grep -oP \"\)\s*\K[0-9]+(?=\.)\"`" -ge '10' ]; then FFLAGS="$FFLAGS -fallow-argument-mismatch" FCFLAGS="$FCFLAGS -fallow-argument-mismatch" fi diff --git a/package/pnetcdf/1.9.0/install.sh b/package/pnetcdf/1.9.0/install.sh index e910f9e7aa40593338144c4d9e1affb210bfdde8..a4279a74d830884b1c91af1b4eda247caa969dc0 100644 --- a/package/pnetcdf/1.9.0/install.sh +++ b/package/pnetcdf/1.9.0/install.sh @@ -9,9 +9,8 @@ rm -rf pnetcdf-${pnetcdf_ver} tar zxvf ${JARVIS_DOWNLOAD}/parallel-netcdf-1.9.0.tar.gz cd parallel-netcdf-1.9.0 use_gcc=0 -which_mpicc=`which mpicc 2> /dev/null 1> /dev/null` -which_ret=$? -if [ "$which_ret" -eq "0" ]; then +which mpicc 2> /dev/null 1> /dev/null +if [ "$?" -eq "0" ]; then if [ "`mpicc --version | grep gcc`" ]; then use_gcc=1 fi @@ -19,7 +18,7 @@ fi FFLAGS="" FCFLAGS="" if [ "$use_gcc" -eq "1" ]; then - if [ "`$CC --version | grep gcc | grep -oP \"\)\s*\K[0-9]+(?=\.)\"`" -ge '10' ]; then + if [ "`mpicc --version | grep gcc | grep -oP \"\)\s*\K[0-9]+(?=\.)\"`" -ge '10' ]; then FFLAGS="-fallow-argument-mismatch" FCFLAGS="-fallow-argument-mismatch" fi