Mercurial > octave
changeset 30385:bae2381fb80a
Backed out changeset 79369ad5cee6
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Sun, 28 Nov 2021 18:15:04 +0100 |
| parents | c767681a981e |
| children | e1d5df076b7c |
| files | src/mkoctfile.in.cc |
| diffstat | 1 files changed, 13 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/mkoctfile.in.cc Sat Nov 27 22:01:20 2021 -0800 +++ b/src/mkoctfile.in.cc Sun Nov 28 18:15:04 2021 +0100 @@ -356,6 +356,11 @@ vars["LD_STATIC_FLAG"] = get_variable ("LD_STATIC_FLAG", %OCTAVE_CONF_LD_STATIC_FLAG%); + // FIXME: Remove LFLAGS in Octave 8.0 + vars["LFLAGS"] = get_variable ("LFLAGS", DEFAULT_LDFLAGS); + if (vars["LFLAGS"] != DEFAULT_LDFLAGS) + std::cerr << "mkoctfile: warning: LFLAGS is deprecated and will be removed in a future version of Octave, use LDFLAGS instead" << std::endl; + vars["F77_INTEGER8_FLAG"] = get_variable ("F77_INTEGER8_FLAG", %OCTAVE_CONF_F77_INTEGER_8_FLAG%); vars["ALL_FFLAGS"] = vars["FFLAGS"] + ' ' + vars["F77_INTEGER8_FLAG"]; @@ -883,6 +888,10 @@ { ++i; + // FIXME: Remove LFLAGS checking in Octave 7.0 + if (argv[i] == "LFLAGS") + std::cerr << "mkoctfile: warning: LFLAGS is deprecated and will be removed in a future version of Octave, use LDFLAGS instead" << std::endl; + if (! var_to_print.empty ()) std::cerr << "mkoctfile: warning: only one '" << arg << "' option will be processed" << std::endl; @@ -1312,8 +1321,8 @@ + vars["ALL_CXXFLAGS"] + ' ' + vars["RDYNAMIC_FLAG"] + ' ' + pass_on_options + ' ' + output_option + ' ' + objfiles + ' ' + libfiles + ' ' + vars["ALL_LDFLAGS"] + ' ' + ldflags + ' ' - + octave_libs + ' ' + vars["OCTAVE_LINK_OPTS"] + ' ' - + vars["OCTAVE_LINK_DEPS"]); + + vars["LFLAGS"] + ' ' + octave_libs + ' ' + + vars["OCTAVE_LINK_OPTS"] + ' ' + vars["OCTAVE_LINK_DEPS"]); int status = run_command (cmd, verbose, printonly); @@ -1341,8 +1350,8 @@ = (vars["CXXLD"] + ' ' + vars["ALL_CXXFLAGS"] + ' ' + pass_on_options + " -o " + octfile + ' ' + objfiles + ' ' + libfiles + ' ' + vars["DL_LDFLAGS"] + ' ' + vars["LDFLAGS"] + ' ' - + ldflags + ' ' + octave_libs + ' ' + vars["OCT_LINK_OPTS"] + ' ' - + vars["OCT_LINK_DEPS"]); + + ldflags + ' ' + vars["LFLAGS"] + ' ' + octave_libs + ' ' + + vars["OCT_LINK_OPTS"] + ' ' + vars["OCT_LINK_DEPS"]); #if defined (OCTAVE_USE_WINDOWS_API) || defined(CROSS) if (! f77files.empty () && ! vars["FLIBS"].empty ())