diff options
| author | James Laird <jlaird@hdfgroup.org> | 2005-02-28 22:54:17 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2005-02-28 22:54:17 (GMT) |
| commit | 5b4232e9d164434e422bdd72199f39507af984d8 (patch) | |
| tree | f872924dd1d0d6f1059cf99a48317933b341286b /fortran/src | |
| parent | 08bce1b7d2969ccb08ad4ba963ec6f17f57e9728 (diff) | |
| download | hdf5-5b4232e9d164434e422bdd72199f39507af984d8.zip hdf5-5b4232e9d164434e422bdd72199f39507af984d8.tar.gz hdf5-5b4232e9d164434e422bdd72199f39507af984d8.tar.bz2 | |
[svn-r10107] Purpose:
Bug fix
Description:
Fortran builds were dying with unknown flags.
Solution:
Fortran builds should be static, not shared. Static flags had been specified
for libraries, but apparently were also needed for executables.
Solved problem by adding static flag to everything in fortran directories.
Platforms tested:
mir, eirene
Diffstat (limited to 'fortran/src')
| -rw-r--r-- | fortran/src/Makefile.am | 6 | ||||
| -rw-r--r-- | fortran/src/Makefile.in | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am index b7445d4..351ecbd 100644 --- a/fortran/src/Makefile.am +++ b/fortran/src/Makefile.am @@ -24,12 +24,12 @@ include $(top_srcdir)/config/commence.am INCLUDES = -I$(top_srcdir)/src AM_FFLAGS=-I$(top_srcdir)/src +# Fortran libraries are linked statically to solve a build problem. +AM_LDFLAGS=-static + # This is our main target, the fortran library lib_LTLIBRARIES=libhdf5_fortran.la -# Fortran library is linked statically to solve a build problem. -libhdf5_fortran_la_LDFLAGS=-static - # Include HDF5.f90 if parallel is disabled, HDF5mpiof* if parallel is enabled if BUILD_PARALLEL_CONDITIONAL PARALLEL_COND_SRC = H5FDmpiof.c HDF5mpio.f90 H5FDmpioff.f90 diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index 4aba994..a737d0a 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -198,12 +198,12 @@ F9XMODFLAG = @F9XMODFLAG@ INCLUDES = -I$(top_srcdir)/src AM_FFLAGS = -I$(top_srcdir)/src +# Fortran libraries are linked statically to solve a build problem. +AM_LDFLAGS = -static + # This is our main target, the fortran library lib_LTLIBRARIES = libhdf5_fortran.la -# Fortran library is linked statically to solve a build problem. -libhdf5_fortran_la_LDFLAGS = -static - # Include HDF5.f90 if parallel is disabled, HDF5mpiof* if parallel is enabled @BUILD_PARALLEL_CONDITIONAL_TRUE@PARALLEL_COND_SRC = H5FDmpiof.c HDF5mpio.f90 H5FDmpioff.f90 @BUILD_PARALLEL_CONDITIONAL_FALSE@PARALLEL_COND_SRC = HDF5.f90 @@ -249,6 +249,7 @@ CONFIG_HEADER = $(top_builddir)/src/H5config.h CONFIG_CLEAN_FILES = h5fc H5fortran_types.f90 libhdf5_fortran.settings LTLIBRARIES = $(lib_LTLIBRARIES) +libhdf5_fortran_la_LDFLAGS = libhdf5_fortran_la_LIBADD = @BUILD_PARALLEL_CONDITIONAL_TRUE@am__objects_1 = H5FDmpiof.lo \ @BUILD_PARALLEL_CONDITIONAL_TRUE@ HDF5mpio.lo H5FDmpioff.lo |