Mercurial > octave
changeset 28861:1807a5762cba
maint: merge stable to default.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Wed, 07 Oct 2020 09:38:48 +0200 |
parents | 20f31c0b0132 (current diff) ba6e10c316d3 (diff) |
children | 500011ff7e3e |
files | NEWS etc/NEWS.6 src/mkoctfile.in.cc |
diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/NEWS.6 Tue Oct 06 10:20:44 2020 +0200 +++ b/etc/NEWS.6 Wed Oct 07 09:38:48 2020 +0200 @@ -268,6 +268,10 @@ -----------------|---------------|------------ | | +- The environment variable used by `mkoctfile` for linker flags is now + `LDFLAGS` rather than `LFLAGS`. `LFLAGS` is deprecated, and a warning + is emitted if it is used, but it will continue to work. + ### Removed functions and properties
--- a/src/mkoctfile.in.cc Tue Oct 06 10:20:44 2020 +0200 +++ b/src/mkoctfile.in.cc Wed Oct 07 09:38:48 2020 +0200 @@ -327,7 +327,7 @@ vars["LD_STATIC_FLAG"] = get_variable ("LD_STATIC_FLAG", %OCTAVE_CONF_LD_STATIC_FLAG%); - // FIXME: Remove LFLAGS in Octave 7.0 + // FIXME: Remove LFLAGS in Octave 8.0 vars["LFLAGS"] = get_variable ("LFLAGS", DEFAULT_LDFLAGS); if (vars["LFLAGS"] != DEFAULT_LDFLAGS) std::cerr << "warning: LFLAGS is deprecated and will be removed in a future version of Octave, use LDFLAGS instead" << std::endl;