diff options
| author | M. Scot Breitenfeld <brtnfld@hdfgroup.org> | 2017-07-27 16:49:38 (GMT) |
|---|---|---|
| committer | M. Scot Breitenfeld <brtnfld@hdfgroup.org> | 2017-07-27 16:49:38 (GMT) |
| commit | 5bc595f6a686c43ce3d910b7e0da61c331363598 (patch) | |
| tree | f9c4c2e5da438e4d999b8c2e3b9b13e733e9344c /fortran | |
| parent | 749d0d83415ace804dc686157c6e4242c716808d (diff) | |
| download | hdf5-5bc595f6a686c43ce3d910b7e0da61c331363598.zip hdf5-5bc595f6a686c43ce3d910b7e0da61c331363598.tar.gz hdf5-5bc595f6a686c43ce3d910b7e0da61c331363598.tar.bz2 | |
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)
Removed FCFLAGS when building the examples since they should already be included the h5fc wrapper. NAG complains about doubly declared options.
Diffstat (limited to 'fortran')
| -rw-r--r-- | fortran/examples/Makefile.am | 4 | ||||
| -rw-r--r-- | fortran/src/h5fc.in | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fortran/examples/Makefile.am b/fortran/examples/Makefile.am index 3428a9e..d78cbb3 100644 --- a/fortran/examples/Makefile.am +++ b/fortran/examples/Makefile.am @@ -68,10 +68,10 @@ h5_crtatt.chkexe_: h5_rdwt.chkexe_ # Additional dependencies for the examples are listed below if BUILD_PARALLEL_CONDITIONAL $(EXTRA_PROG): $(H5FC_PP) - $(H5FC_PP) $(H5CCFLAGS) $(FCFLAGS) -o $@ $(srcdir)/$@.f90; + $(H5FC_PP) $(H5CCFLAGS) -o $@ $(srcdir)/$@.f90; else $(EXTRA_PROG): $(H5FC) - $(H5FC) $(H5CCFLAGS) $(FCFLAGS) -o $@ $(srcdir)/$@.f90; + $(H5FC) $(H5CCFLAGS) -o $@ $(srcdir)/$@.f90; endif # Tell automake how to install examples diff --git a/fortran/src/h5fc.in b/fortran/src/h5fc.in index 47642c9..29ef83f 100644 --- a/fortran/src/h5fc.in +++ b/fortran/src/h5fc.in @@ -307,7 +307,7 @@ if test "x$do_link" = "xyes"; then link_args="$link_args -L${libdir}" case "$host_os" in - linux*) flag="-Wl,-rpath -Wl," ;; + linux*) flag="@fortran_linux_linker_option@-rpath -Wl," ;; hpux*) flag="-Wl,+b -Wl," ;; freebsd*|solaris*) flag="-R" ;; rs6000*|aix*) flag="-L" ;; |