diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2021-08-19 20:57:48 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-19 20:57:48 (GMT) |
| commit | 564380d176ae71d9f4ece9df51957e3f817be45d (patch) | |
| tree | c1c61d1928b810df7ac74cf4e744c2742dc5a872 | |
| parent | 2524b57a6f69e1a24212cba12d504748e13e9743 (diff) | |
| download | hdf5-564380d176ae71d9f4ece9df51957e3f817be45d.zip hdf5-564380d176ae71d9f4ece9df51957e3f817be45d.tar.gz hdf5-564380d176ae71d9f4ece9df51957e3f817be45d.tar.bz2 | |
Fix issue #924 in develop branch: the ${HDF5_CXXLINKER} does not work 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>
| -rw-r--r-- | c++/src/h5c++.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/c++/src/h5c++.in b/c++/src/h5c++.in index cf993b9..573d20d 100644 --- a/c++/src/h5c++.in +++ b/c++/src/h5c++.in @@ -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. ## ## ## ############################################################################ @@ -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}" |