summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorBill Wendling <wendling@ncsa.uiuc.edu>2003-05-28 00:58:56 (GMT)
committerBill Wendling <wendling@ncsa.uiuc.edu>2003-05-28 00:58:56 (GMT)
commit464c3245b8ac8acdff3988515664e224bb815cfa (patch)
treefa892ba4195c17061827a10ed35fcb613ed70be3 /tools
parentc84277c53f218cfebaa5731216add9109f999dca (diff)
downloadhdf5-464c3245b8ac8acdff3988515664e224bb815cfa.zip
hdf5-464c3245b8ac8acdff3988515664e224bb815cfa.tar.gz
hdf5-464c3245b8ac8acdff3988515664e224bb815cfa.tar.bz2
[svn-r6919] Purpose:
Bug Fix Description: Two things: - static libraries may depend upon the HDF5 library. We should put them before the HDF5 library on the commandline instead of afterwards to avoid conflict. - the CFLAGS weren't being used during linking. This was causing problems on Arabica where the flags are important to distinguish between building a 32-bit and 64-bit application. Solution: - Added logic so that it catches the static libraries and puts them before the hdf5 library on the command line. WARNING: This may not work in all situations...but it should be okay for the good majority. - added the CFLAGS macro to the commandline... Platforms tested: LInux (Colonelk) Arabica Modi4 (Parallel) (Small changes so doesn't need full h5committesting...) Misc. update:
Diffstat (limited to 'tools')
-rwxr-xr-xtools/misc/h5cc.in5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/misc/h5cc.in b/tools/misc/h5cc.in
index cde9a33..2f598fc 100755
--- a/tools/misc/h5cc.in
+++ b/tools/misc/h5cc.in
@@ -41,6 +41,7 @@ prog_name="`basename $0`"
allargs=""
compile_args=""
libraries=""
+archives=""
link_args=""
link_objs=""
clibpath=""
@@ -204,7 +205,7 @@ for arg in $@ ; do
fi
elif test "x$ext" = "x.a"; then
# This is an archive that we're linking in
- libraries=" $libraries $arg "
+ archives=" $archives $arg "
else
compile_args="$compile_args $arg"
link_args="$link_args $arg"
@@ -278,7 +279,7 @@ if test "x$do_link" = "xyes"; then
fi
done
- $SHOW $CLINKER $LDFLAGS $clibpath $link_objs $link_args $shared_link
+ $SHOW $CLINKER $CFLAGS $LDFLAGS $clibpath $link_objs $archives $link_args $shared_link
status=$?
fi