Mercurial > octave

comparison src/mkoctfile.in.cc @ 28048:42921bff241a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix mkoctfile on Windows platforms when compiling Fortran sources (bug #49548). * mkoctfile.in.cc: If compiling on Windows, add the FLIBS variable to the link command when Fortran sources are given.
author Mike Miller <mtmiller@octave.org>
date Fri, 07 Feb 2020 08:44:07 -0800
parents 49a0d90cd2a3
children cf59b503db2a
comparison
equal deleted inserted replaced
28047:bd7d82fc65ba 28048:42921bff241a
1126 + vars["DL_LDFLAGS"] + ' ' + vars["LDFLAGS"] + ' ' + pass_on_options 1126 + vars["DL_LDFLAGS"] + ' ' + vars["LDFLAGS"] + ' ' + pass_on_options
1127 + " -o " + octfile + ' ' + objfiles + ' ' + libfiles + ' ' 1127 + " -o " + octfile + ' ' + objfiles + ' ' + libfiles + ' '
1128 + ldflags + ' ' + vars["LFLAGS"] + ' ' + octave_libs + ' ' 1128 + ldflags + ' ' + vars["LFLAGS"] + ' ' + octave_libs + ' '
1129 + vars["OCT_LINK_OPTS"] + ' ' + vars["OCT_LINK_DEPS"]); 1129 + vars["OCT_LINK_OPTS"] + ' ' + vars["OCT_LINK_DEPS"]);
1130 1130
1131 #if defined (OCTAVE_USE_WINDOWS_API) || defined(CROSS)
1132 if (! f77files.empty () && ! vars["FLIBS"].empty ())
1133 cmd += ' ' + vars["FLIBS"];
1134 #endif
1135
1131 int status = run_command (cmd, printonly); 1136 int status = run_command (cmd, printonly);
1132 1137
1133 clean_up_tmp_files (tmp_objfiles); 1138 clean_up_tmp_files (tmp_objfiles);
1134 1139
1135 if (status) 1140 if (status)