Mercurial > octave
changeset 28833:27df9b38391d stable
mkoctfile.in.cc: Pass linker flags last (bug #59173).
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Wed, 30 Sep 2020 08:45:42 +0200 |
parents | 7b819cd7ff54 |
children | a55766bb10ca 2735fb9007e9 |
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 10:05:07 2020 -0400 +++ b/src/mkoctfile.in.cc Wed Sep 30 08:45:42 2020 +0200 @@ -1101,9 +1101,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); @@ -1130,8 +1130,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"]);