Skip to content

Commit

Permalink
Fix issue #924 in develop branch: the ${HDF5_CXXLINKER} does not work…
Browse files Browse the repository at this point in the history
… in h5c++ (#925)

* Committing clang-format changes

* Fix issue #924, ${HDF5_CXXLINKER} does not work in h5c++.
2 instances of CLINKER corrected to CXXLINKER
comment border aligned

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
lrknox and github-actions[bot] authored Aug 19, 2021
1 parent 2524b57 commit 564380d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions c++/src/h5c++.in
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ HL="@HL@"
## (Advanced usage - know what you're doing - you're on your own here.) ##
## The four variables below can be used to insert paths and flags in ##
## CPPFLAGS, CXXFLAGS, LDFLAGS, or LIBS in the h5cc compile line: ##
## $CLINKER $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CXXFLAGS $CXXFLAGS ##
## $CXXLINKER $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CXXFLAGS $CXXFLAGS ##
## $LDFLAGS $LIBS $clibpath $link_objs $link_args $shared_link ##
## ##
## These settings can be overridden by setting HDF5_CXXFLAGS, ##
## These settings can be overridden by setting HDF5_CXXFLAGS, ##
## HDF5_CPPFLAGS, HDF5_LDFLAGS, or HDF5_LIBS in the environment. ##
## ##
############################################################################
Expand Down Expand Up @@ -93,7 +93,7 @@ H5BLD_LDFLAGS="@AM_LDFLAGS@ @LDFLAGS@"
H5BLD_LIBS="@LIBS@"

CXX="${HDF5_CXX:-$CXXBASE}"
CXXLINKER="${HDF5_CLINKER:-$CXXLINKERBASE}"
CXXLINKER="${HDF5_CXXLINKER:-$CXXLINKERBASE}"
CXXFLAGS="${HDF5_CXXFLAGS:-$CXXFLAGSBASE}"
CPPFLAGS="${HDF5_CPPFLAGS:-$CPPFLAGSBASE}"
LDFLAGS="${HDF5_LDFLAGS:-$LDFLAGSBASE}"
Expand Down

0 comments on commit 564380d

Please sign in to comment.