Mercurial > octave

changeset 28834:a55766bb10ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default.
author Markus Mützel <markus.muetzel@gmx.de>
date Wed, 30 Sep 2020 17:51:11 +0200
parents 6d50f931e810 (current diff) 27df9b38391d (diff)
children 7d9a11de251f
files src/mkoctfile.in.cc
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/mkoctfile.in.cc	Wed Sep 30 17:46:50 2020 +0200
+++ b/src/mkoctfile.in.cc	Wed Sep 30 17:51:11 2020 +0200
@@ -1243,9 +1243,9 @@
           std::string cmd
             = (vars["CXXLD"] + ' ' + vars["CPPFLAGS"] + ' '
                + vars["ALL_CXXFLAGS"] + ' ' + vars["RDYNAMIC_FLAG"] + ' '
-               + vars["ALL_LDFLAGS"] + ' ' + pass_on_options + ' '
-               + output_option + ' ' + objfiles + ' ' + libfiles + ' '
-               + ldflags + ' ' + vars["LFLAGS"] + ' ' + octave_libs + ' '
+               + pass_on_options + ' ' + output_option + ' ' + objfiles + ' '
+               + libfiles + ' ' + vars["ALL_LDFLAGS"] + ' ' + ldflags + ' '
+               + vars["LFLAGS"] + ' ' + octave_libs + ' '
                + vars["OCTAVE_LINK_OPTS"] + ' ' + vars["OCTAVE_LINK_DEPS"]);
 
           int status = run_command (cmd, printonly);
@@ -1272,8 +1272,8 @@
 
       std::string cmd
         = (vars["CXXLD"] + ' ' + vars["ALL_CXXFLAGS"] + ' '
-           + vars["DL_LDFLAGS"] + ' ' + vars["LDFLAGS"] + ' ' + pass_on_options
-           + " -o " + octfile + ' ' + objfiles + ' ' + libfiles + ' '
+           + 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"]);