mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-04-24 17:51:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:develop to develop

Browse Source 
* commit '2a1e499b0134ed319cd9d60a6521ba83b3a2cfa8':
  changed comments, (HDFFV-10037)
  changed the test for NAG fortran compiler, (HDFFV-10037)
This commit is contained in:
Scot Breitenfeld 2017-08-03 10:30:26 -05:00
commit a6d5bf1a86
1 changed files with 5 additions and 5 deletions

10
configure.ac

@ -3340,10 +3340,10 @@ fi
if test "X$HDF_FORTRAN" = "Xyes"; then
### libtool does not pass the correct argument linking (-WL,-WL,,) for the NAG Fortran compiler
### libtool does not pass the correct argument linking (-Wl,-Wl,,) for the NAG Fortran compiler
### on Linux (other OSs have not been tested).
### Therefore, detect if we are using the NAG Fortran compiler, and replace the wl="-Wl," for Fortran to
### wl="-Wl,-WL,," in the libtool file. (HDFFV-10037)
### wl="-Wl,-Wl,," in the libtool file. (HDFFV-10037)
case "`uname`" in
Linux*)
@ -3510,13 +3510,13 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
;;
esac
### libtool does not pass the correct argument linking (-WL,-WL,,) for the NAG Fortran compiler
### libtool does not pass the correct argument linking (-Wl,-Wl,,) for the NAG Fortran compiler
### on Linux (other OSs have not been tested).
### Therefore, detect if we are using the NAG Fortran compiler, and replace the wl="-Wl," for Fortran to
### wl="-Wl,-WL,," in the libtool file. (HDFFV-10037)
### wl="-Wl,-Wl,," in the libtool file. (HDFFV-10037)
case "`uname`" in
Linux*)
if (grep -i 'NAG_Fortran' libtool > /dev/null); then
if test "X$FC_BASENAME" = "Xnagfor"; then
cat libtool | awk '/NAG_Fortran/{flag=1}flag&&/wl=/{$NF="wl=\"-Wl,Wl,,\"";flag=0}1' > libtool.tmp && mv -f libtool.tmp libtool && chmod 755 libtool
fi
;;