Mercurial > octave

changeset 28831:bf427855cc9a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change mkoctfile to print a usable default LDFLAGS on Windows platforms (bug #59173). * mkoctfile.in.cc: Re-arrange code for DEFAULT_INCFLAGS to clarify pattern. Change LDFLAGS code to use either the environment variable (first choice) or DEFAULT_LDFLAGS variable.
author Rik <rik@octave.org>
date Mon, 28 Sep 2020 15:43:50 -0700
parents 83d1852eb0e6
children 6d50f931e810
files src/mkoctfile.in.cc
diffstat 1 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/mkoctfile.in.cc	Wed Sep 30 08:36:21 2020 +0200
+++ b/src/mkoctfile.in.cc	Mon Sep 28 15:43:50 2020 -0700
@@ -213,14 +213,14 @@
     = get_variable ("OCTLIBDIR",
                     prepend_octave_exec_home (%OCTAVE_CONF_OCTLIBDIR%));
 
+  std::string DEFAULT_INCFLAGS;
+
 #if defined (OCTAVE_USE_WINDOWS_API)
-  std::string DEFAULT_INCFLAGS
-    = "-I" + quote_path (vars["OCTINCLUDEDIR"] + R"(\..)")
-      + " -I" + quote_path (vars["OCTINCLUDEDIR"]);
+  DEFAULT_INCFLAGS = "-I" + quote_path (vars["OCTINCLUDEDIR"] + R"(\..)")
+                     + " -I" + quote_path (vars["OCTINCLUDEDIR"]);
 #else
-  std::string DEFAULT_INCFLAGS
-    = "-I" + quote_path (vars["OCTINCLUDEDIR"] + "/..")
-      + " -I" + quote_path (vars["OCTINCLUDEDIR"]);
+  DEFAULT_INCFLAGS = "-I" + quote_path (vars["OCTINCLUDEDIR"] + "/..")
+                     + " -I" + quote_path (vars["OCTINCLUDEDIR"]);
 #endif
 
   if (vars["INCLUDEDIR"] != "/usr/include")
@@ -320,7 +320,7 @@
   vars["OCT_LINK_OPTS"] = get_variable ("OCT_LINK_OPTS",
                                         %OCTAVE_CONF_OCT_LINK_OPTS%);
 
-  vars["LDFLAGS"] = get_variable ("LDFLAGS", %OCTAVE_CONF_LDFLAGS%);
+  vars["LDFLAGS"] = get_variable ("LDFLAGS", DEFAULT_LDFLAGS);
 
   vars["LD_STATIC_FLAG"] = get_variable ("LD_STATIC_FLAG",
                                          %OCTAVE_CONF_LD_STATIC_FLAG%);