Mercurial > octave

changeset 30342:79369ad5cee6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate LFLAGS from mkoctfile * mkoctfile.in.cc: Delete all uses of LFLAGS.
author John W. Eaton <jwe@octave.org>
date Wed, 24 Nov 2021 11:54:24 -0500
parents ecf207896f76
children 0ec5eaabaf2c
files src/mkoctfile.in.cc
diffstat 1 files changed, 4 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/src/mkoctfile.in.cc	Wed Nov 24 11:02:23 2021 -0500
+++ b/src/mkoctfile.in.cc	Wed Nov 24 11:54:24 2021 -0500
@@ -356,11 +356,6 @@
   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"];
@@ -888,10 +883,6 @@
             {
               ++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;
@@ -1321,8 +1312,8 @@
                + vars["ALL_CXXFLAGS"] + ' ' + vars["RDYNAMIC_FLAG"] + ' '
                + pass_on_options + ' ' + output_option + ' ' + objfiles + ' '
                + libfiles + ' ' + vars["ALL_LDFLAGS"] + ' ' + ldflags + ' '
-               + vars["LFLAGS"] + ' ' + octave_libs + ' '
-               + vars["OCTAVE_LINK_OPTS"] + ' ' + vars["OCTAVE_LINK_DEPS"]);
+               + octave_libs + ' ' + vars["OCTAVE_LINK_OPTS"] + ' '
+               + vars["OCTAVE_LINK_DEPS"]);
 
           int status = run_command (cmd, verbose, printonly);
 
@@ -1350,8 +1341,8 @@
         = (vars["CXXLD"] + ' ' + vars["ALL_CXXFLAGS"] + ' '
            + pass_on_options + " -o " + octfile + ' ' + objfiles + ' '
            + libfiles + ' ' + vars["DL_LDFLAGS"] + ' ' + vars["LDFLAGS"] + ' '
-           + ldflags + ' ' + vars["LFLAGS"] + ' ' + octave_libs + ' '
-           + vars["OCT_LINK_OPTS"] + ' ' + vars["OCT_LINK_DEPS"]);
+           + ldflags + ' ' + octave_libs + ' ' + vars["OCT_LINK_OPTS"] + ' '
+           + vars["OCT_LINK_DEPS"]);
 
 #if defined (OCTAVE_USE_WINDOWS_API) || defined(CROSS)
       if (! f77files.empty () && ! vars["FLIBS"].empty ())