From 1fa0de7a814b8786fe7df6e265128a04a95b2339 Mon Sep 17 00:00:00 2001 From: Mike McGreevy Date: Wed, 28 Oct 2009 14:05:35 -0500 Subject: [svn-r17773] Purpose: h5cc link-line reordering Description: Re-ordered flags in h5cc such that LDFLAGS appears after hdf5 library include path. This is to ensure third party library locations don't interfere with locating the correct version of hdf5 library. I have Elena's permission to bring into 1.8 before anything else (so it can be tested via daily tests ASAP), though the hope is to propagate everywhere. Tested: quickly by hand on jam, daily tests should catch elsewhere. --- c++/src/h5c++.in | 2 +- fortran/src/h5fc.in | 2 +- tools/misc/h5cc.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/c++/src/h5c++.in b/c++/src/h5c++.in index 6620e40..aac8f40 100755 --- a/c++/src/h5c++.in +++ b/c++/src/h5c++.in @@ -317,7 +317,7 @@ if test "x$do_link" = "xyes"; then # module. It's okay if they're included twice in the compile line. link_args="$link_args $LIBS" - $SHOW $CXXLINKER $CPPFLAGS $CXXFLAGS $LDFLAGS $clibpath $link_objs $link_args $shared_link + $SHOW $CXXLINKER $CPPFLAGS $CXXFLAGS $clibpath $link_objs $link_args $shared_link $LDFLAGS status=$? fi diff --git a/fortran/src/h5fc.in b/fortran/src/h5fc.in index 5b915d5..df52971 100755 --- a/fortran/src/h5fc.in +++ b/fortran/src/h5fc.in @@ -295,7 +295,7 @@ if test "x$do_link" = "xyes"; then # module. It's okay if they're included twice in the compile line. link_args="$link_args $LIBS" - $SHOW $FLINKER $FFLAGS $F9XSUFFIXFLAG $fmodules $LDFLAGS $link_objs $link_args $shared_link + $SHOW $FLINKER $FFLAGS $F9XSUFFIXFLAG $fmodules $link_objs $link_args $shared_link $LDFLAGS status=$? fi diff --git a/tools/misc/h5cc.in b/tools/misc/h5cc.in index 3422bdd..28f0dee 100755 --- a/tools/misc/h5cc.in +++ b/tools/misc/h5cc.in @@ -318,7 +318,7 @@ if test "x$do_link" = "xyes"; then # module. It's okay if they're included twice in the compile line. link_args="$link_args $LIBS" - $SHOW $CLINKER $CFLAGS $LDFLAGS $clibpath $link_objs $link_args $shared_link + $SHOW $CLINKER $CFLAGS $clibpath $link_objs $link_args $shared_link $LDFLAGS status=$? fi -- cgit v0.12