refactor: move comparator to definition

Author: Samat Gaynutdinov

server/src/printers/NativeMakefilePrinter.cpp

@@ -111,7 +111,12 @@ namespace printer {
           pathToShellVariable({{buildDirectory, "$(BUILD_DIR)"},
                               {projectContext.projectPath, "$(PROJECT_DIR)"},
                               {buildDirectoryRelative, "$(BUILD_RELATIVE)"}},
-                              comparator
+                              [](const std::string& lhs, const std::string& rhs) -> bool {
+                                  if (rhs == Paths::getUTBotRootDir().string()) {
+                                      return true;
+                                  }
+                                  return std::greater<>()(lhs, rhs);
+                              }
                               ),
           stubSources(stubSources) {
 
@@ -703,8 +708,8 @@ namespace printer {
 
     fs::path NativeMakefilePrinter::getRelativePathForLinker(fs::path path) const {
         const auto compiler = CompilationUtils::getCompilerName(path);
-        if (compiler == CompilationUtils::CompilerName::UNKNOWN) {
-            // not compiler
+        if (compiler == CompilationUtils::CompilerName::CLANGXX) {
+            // don't transform to canonical if CLANGXX
             return getRelativePath(path);
         }
         return getRelativePath(path, false);

server/src/printers/NativeMakefilePrinter.h

@@ -15,12 +15,6 @@ namespace printer {
     class NativeMakefilePrinter : public DefaultMakefilePrinter {
         friend class TestMakefilesPrinter;
     private:
-        std::function<bool(const std::string&, const std::string&)> comparator = [](const std::string& lhs, const std::string& rhs) -> bool {
-            if (rhs == Paths::getUTBotRootDir().string()) {
-                return true;
-            }
-            return std::greater<>()(lhs, rhs);
-        };
         const utbot::ProjectContext projectContext;
         std::shared_ptr<BuildDatabase> buildDatabase;
         fs::path rootPath;
@@ -38,7 +32,7 @@ namespace printer {
         fs::path buildDirectory, dependencyDirectory, buildDirectoryRelative;
 
         // map variable with absolute path to $(someVar)
-        std::map<std::string, fs::path, decltype(comparator)> pathToShellVariable;
+        std::map<std::string, fs::path, std::function<bool(const std::string&, const std::string&)>> pathToShellVariable;
 
         std::vector<fs::path> artifacts{};