Skip to content

Commit cb859cf

Browse files
author
Samat Gaynutdinov
committed
fix: put cd in commands in generationCompileMakefile.mk & relative stubs var
1 parent afa917a commit cb859cf

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

server/src/building/CompileCommand.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ namespace utbot {
6868
return *this;
6969
}
7070

71-
CompileCommand::CompileCommand(const CompileCommand &other, bool shouldChangeDirectory) :
71+
CompileCommand::CompileCommand(const CompileCommand &other, bool shouldChangeDirectory_) :
7272
CompileCommand(other) {
73-
shouldChangeDirectory = shouldChangeDirectory;
73+
shouldChangeDirectory = shouldChangeDirectory_;
7474
}
7575

7676
CompileCommand::CompileCommand(std::vector<std::string> arguments,

server/src/printers/NativeMakefilePrinter.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,11 @@ namespace printer {
594594
addCompileTarget(stub, target, *compilationUnitInfo);
595595
return target;
596596
});
597-
declareVariable(STUB_OBJECT_FILES_NAME, StringUtils::joinWith(stubObjectFiles, " "));
597+
auto stubObjectFilesRelative = CollectionUtils::transformTo<CollectionUtils::FileSet>(
598+
stubObjectFiles, [this](fs::path const &stub) {
599+
return getRelativePath(stub);
600+
});
601+
declareVariable(STUB_OBJECT_FILES_NAME, StringUtils::joinWith(stubObjectFilesRelative, " "));
598602
}
599603

600604
void NativeMakefilePrinter::close() {

0 commit comments

Comments
 (0)