Skip to content

Commit 50d609a

Browse files
committed
Fix more compile errors with msvc/cl
1 parent abef187 commit 50d609a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

wilco/src/buildconfigurator.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ void BuildConfigurator::collectCommands(Environment& env, std::vector<CommandEnt
5757
{
5858
throw std::runtime_error("Command '" + command.description + "' in project " + project.name + " has rspContents set but no corresponding rspFile.");
5959
}
60-
if (!command.rspFile.empty() && command.command.find("@" + str::quote(command.rspFile)) == std::string::npos)
60+
if (!command.rspFile.empty() && command.command.find("@" + str::quote(command.rspFile.string())) == std::string::npos)
6161
{
6262
throw std::runtime_error("Command '" + command.description + "' in project " + project.name + " has rspFile set but no corresponding @rspFile in the command string. Currently @\"quoted/path\" is the only supported rsp file flag format, and path must be lexically identical to rspFile.");
6363
}
@@ -113,7 +113,7 @@ static void generateCompileCommandsJson(std::ostream& stream, const Database& da
113113
}
114114
else
115115
{
116-
std::string rspFlag = "@" + str::quote(command.rspFile);
116+
std::string rspFlag = "@" + str::quote(command.rspFile.string());
117117
// Expand rsp contents since the rsp files are transient and won't be
118118
// available to whatever consumes the compile commands file.
119119
stream << " \"command\": " << str::quote(str::replaceAll(command.command, rspFlag, command.rspContents)) << "\n";

0 commit comments

Comments
 (0)