philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn-r17773] Purpose:

Browse Source 
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.
This commit is contained in:
Mike McGreevy
2009-10-28 14:05:35 -05:00
parent 6f29232adb
commit 1fa0de7a81
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
c++/src/h5c++.in
View File

@@ -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

2
fortran/src/h5fc.in
View File

@@ -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

2
tools/misc/h5cc.in
View File

@@ -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