3 files changed, 6 insertions, 4 deletions
diff --git a/src/base/hostinfo.cc b/src/base/hostinfo.cc
index 7cc07c11e..ef64feeb4 100644
--- a/src/base/hostinfo.cc
+++ b/src/base/hostinfo.cc
@@ -60,7 +60,7 @@ hostname()
 }
 
 uint64_t
-procInfo(char *filename, char *target)
+procInfo(const char *filename, const char *target)
 {
     int  done = 0;
     char line[80];
diff --git a/src/base/hostinfo.hh b/src/base/hostinfo.hh
index b6663ea69..70cd19203 100644
--- a/src/base/hostinfo.hh
+++ b/src/base/hostinfo.hh
@@ -37,7 +37,7 @@
 
 std::string &hostname();
 
-uint64_t procInfo(char *filename, char *target);
+uint64_t procInfo(const char *filename, const char *target);
 
 inline uint64_t memUsage()
 { return procInfo("/proc/self/status", "VmSize:"); }
diff --git a/src/base/inifile.cc b/src/base/inifile.cc
index 4d504d04f..809cbe172 100644
--- a/src/base/inifile.cc
+++ b/src/base/inifile.cc
@@ -111,7 +111,7 @@ IniFile::loadCPP(const string &file, vector<char *> &cppArgs)
 
         int arg_count = cppArgs.size();
 
-        char **args = new char *[arg_count + 20];
+        const char **args = new const char *[arg_count + 20];
 
         int nextArg = 0;
         args[nextArg++] = "g++";
@@ -136,7 +136,9 @@ IniFile::loadCPP(const string &file, vector<char *> &cppArgs)
         if (dup2(tmp_fd, STDOUT_FILENO) == -1)
             exit(1);
 
-        execvp("g++", args);
+        // execvp signature is intentionally broken wrt const-ness for
+        // backwards compatibility... see man page
+        execvp("g++", const_cast<char * const *>(args));
 
         exit(0);
     }