celeron55/buildat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

server/rccpp: Workaround different PATH handling in Wine

Browse Source
This commit is contained in:
Perttu Ahola 2014-10-31 13:44:42 +02:00
parent c0d42a9ccb
commit 55b4a74a31
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/server/rccpp.cpp
View File

@ -4,6 +4,7 @@
#include "core/log.h"
#include "interface/server.h"
#include "interface/process.h"
#include "interface/fs.h"
#include <c55/filesys.h>
#include <vector>
#include <string>
@ -103,7 +104,22 @@ struct CCompiler: public Compiler
for(const std::string &lib : libraries) command += " "+lib;
int exit_status = interface::process::shell_exec(command);
interface::process::ExecOptions exec_opts;
#ifdef _WIN32
// If compiler_command looks like a path, add the directory part of it to
// PATH. This seems to be required on Wine for running mingw g++, in which
// case the DLLs are in the directory of the called executable, but the
// called executable calls another executable in a directory that does not
// contain the DLLs.
if(m_compiler_command.find("/") != ss_::npos ||
m_compiler_command.find("\\") != ss_::npos){
ss_ command_dir = interface::fs::strip_file_name(m_compiler_command);
exec_opts.env["PATH"] = command_dir + ";" +
interface::process::get_environment_variable("PATH");
log_d(MODULE, "Using PATH=%s", cs(exec_opts.env["PATH"]));
}
#endif
int exit_status = interface::process::shell_exec(command, exec_opts);
return exit_status == 0;
}