refactor: fix uppercase

Author: Samat Gaynutdinov

server/src/printers/NativeMakefilePrinter.cpp

@@ -145,11 +145,11 @@ namespace printer {
 
         declareShellVariable("ASAN_LIB", Paths::getAsanLibraryPath(), declareVariableFunc);
 
-        declareShellVariable("CLANG", Paths::getUTBotClang(), declareVariableWithPriorityFunc, false, false);
+        declareShellVariable("CLANG", Paths::getUTBotClang(), declareVariableWithPriorityFunc);
 
         declareShellVariable("CLANGXX", Paths::getUTBotClangPP(), declareVariableWithPriorityFunc, false, false);
 
-        pathToShellVariable[Paths::getUTBotClang()] = StringUtils::stringFormat("$(%s)", "CLANG");
+//        pathToShellVariable[Paths::getUTBotClang()] = StringUtils::stringFormat("$(%s)", "CLANG");
         pathToShellVariable[Paths::getUTBotClangPP()] = StringUtils::stringFormat("$(%s)", "CLANGXX");
 
         declareShellVariable("GCC", Paths::getGcc(), declareVariableFunc);
@@ -708,10 +708,10 @@ namespace printer {
 
     fs::path NativeMakefilePrinter::getRelativePathForLinker(fs::path path) const {
         const auto compiler = CompilationUtils::getCompilerName(path);
-        if (compiler == CompilationUtils::CompilerName::CLANGXX) {
-            // don't transform to canonical if CLANGXX
+        if (compiler != CompilationUtils::CompilerName::CLANGXX) {
             return getRelativePath(path);
         }
+        // don't transform to canonical if CLANGXX
         return getRelativePath(path, false);
     }
 

server/src/printers/TestMakefilesPrinter.cpp

@@ -79,7 +79,7 @@ namespace printer {
         // magic spell from https://stackoverflow.com/questions/18136918/how-to-get-current-relative-directory-of-your-makefile
         generalMakefilePrinter.declareVariable("export MAKEFILE_DIR", "$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))");
         generalMakefilePrinter.declareVariable("export PROJECT_DIR",
-                                               StringUtils::stringFormat("%s/%s", "$(MAKEFILE_DIR)", "$(project_dir_relative_to_makefile)"));
+                                               StringUtils::stringFormat("%s/%s", "$(MAKEFILE_DIR)", "$(PROJECT_DIR_RELATIVE_TO_MAKEFILE)"));
         generalMakefilePrinter.declareVariable("export BUILD_RELATIVE", objMakefilePrinter.buildDirectoryRelative);
         generalMakefilePrinter.declareVariable("export BUILD_DIR", StringUtils::stringFormat("%s/%s",
                                                   objMakefilePrinter.getRelativePath(projectContext.projectPath),