summaryrefslogtreecommitdiffstats
path: root/perform
diff options
context:
space:
mode:
authorMike McGreevy <mamcgree@hdfgroup.org>2009-07-23 20:04:18 (GMT)
committerMike McGreevy <mamcgree@hdfgroup.org>2009-07-23 20:04:18 (GMT)
commit6a00b1b6ffe86872088f92f38c98ccd6599d3c6c (patch)
treebab50938ed33e313d37c381b1769ff2a95f15502 /perform
parent3a8bce5cb845685b9cfb7267ad6addc155dea567 (diff)
downloadhdf5-6a00b1b6ffe86872088f92f38c98ccd6599d3c6c.zip
hdf5-6a00b1b6ffe86872088f92f38c98ccd6599d3c6c.tar.gz
hdf5-6a00b1b6ffe86872088f92f38c98ccd6599d3c6c.tar.bz2
[svn-r17228] Purpose:
Fix BZ #1583 Description: The --enable-static-exec flag was broken. Configure was adding the -all-static linker flag to an environment variable which was subsequently never used. (looks like it was used in 1.6 Makefile.ins, but never moved to 1.8's Makefile.ams when we added automake support). To fix, I've added this environment varibale to the link lines of all the tools. Now, when --enable-static-exec is invoked, it will correctly generate statically linked executables in the installed bin directory. Tested: I've tested manually to ensure that the generated execs are static when the flag is used and dynamic when not. I've also tested when szip is used, as this was a use case mentioned in the bug report. Also: ran full tests with make check on jam and smirom for good measure.
Diffstat (limited to 'perform')
-rw-r--r--perform/Makefile.am4
-rw-r--r--perform/Makefile.in14
2 files changed, 16 insertions, 2 deletions
diff --git a/perform/Makefile.am b/perform/Makefile.am
index 603175d..255275e 100644
--- a/perform/Makefile.am
+++ b/perform/Makefile.am
@@ -30,6 +30,10 @@ else
bin_PROGRAMS=h5perf_serial
endif
+# Add h5perf and h5perf_serial specific linker flags here
+h5perf_LDFLAGS = $(LT_STATIC_EXEC)
+h5perf_serial_LDFLAGS = $(LT_STATIC_EXEC)
+
# Some programs are not built or run by default, but can be built by hand or by
# specifying --enable-build-all at configure time.
# Also, some of these programs should only be built in parallel.
diff --git a/perform/Makefile.in b/perform/Makefile.in
index 0d4815d..ee0f090 100644
--- a/perform/Makefile.in
+++ b/perform/Makefile.in
@@ -88,10 +88,16 @@ am_h5perf_OBJECTS = pio_perf.$(OBJEXT) pio_engine.$(OBJEXT) \
pio_timer.$(OBJEXT)
h5perf_OBJECTS = $(am_h5perf_OBJECTS)
h5perf_DEPENDENCIES = $(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5)
+h5perf_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(h5perf_LDFLAGS) \
+ $(LDFLAGS) -o $@
am_h5perf_serial_OBJECTS = sio_perf.$(OBJEXT) sio_engine.$(OBJEXT) \
sio_timer.$(OBJEXT)
h5perf_serial_OBJECTS = $(am_h5perf_serial_OBJECTS)
h5perf_serial_DEPENDENCIES = $(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5)
+h5perf_serial_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(h5perf_serial_LDFLAGS) $(LDFLAGS) -o $@
iopipe_SOURCES = iopipe.c
iopipe_OBJECTS = iopipe.$(OBJEXT)
iopipe_DEPENDENCIES = $(LIBH5TEST) $(LIBHDF5)
@@ -384,6 +390,10 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib
@BUILD_PARALLEL_CONDITIONAL_TRUE@TEST_PROG_PARA = h5perf perf
+# Add h5perf and h5perf_serial specific linker flags here
+h5perf_LDFLAGS = $(LT_STATIC_EXEC)
+h5perf_serial_LDFLAGS = $(LT_STATIC_EXEC)
+
# Some programs are not built or run by default, but can be built by hand or by
# specifying --enable-build-all at configure time.
# Also, some of these programs should only be built in parallel.
@@ -501,10 +511,10 @@ chunk$(EXEEXT): $(chunk_OBJECTS) $(chunk_DEPENDENCIES)
$(LINK) $(chunk_OBJECTS) $(chunk_LDADD) $(LIBS)
h5perf$(EXEEXT): $(h5perf_OBJECTS) $(h5perf_DEPENDENCIES)
@rm -f h5perf$(EXEEXT)
- $(LINK) $(h5perf_OBJECTS) $(h5perf_LDADD) $(LIBS)
+ $(h5perf_LINK) $(h5perf_OBJECTS) $(h5perf_LDADD) $(LIBS)
h5perf_serial$(EXEEXT): $(h5perf_serial_OBJECTS) $(h5perf_serial_DEPENDENCIES)
@rm -f h5perf_serial$(EXEEXT)
- $(LINK) $(h5perf_serial_OBJECTS) $(h5perf_serial_LDADD) $(LIBS)
+ $(h5perf_serial_LINK) $(h5perf_serial_OBJECTS) $(h5perf_serial_LDADD) $(LIBS)
iopipe$(EXEEXT): $(iopipe_OBJECTS) $(iopipe_DEPENDENCIES)
@rm -f iopipe$(EXEEXT)
$(LINK) $(iopipe_OBJECTS) $(iopipe_LDADD) $(LIBS)