Merge pull request #1179 from martong/fix_resource_dir2

Move up resource dir
Ericsson · Nov 27, 2017 · 1748079 · 1748079
2 parents ff2db7c + 9c56132
commit 1748079
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/libcodechecker/analyze/analyzers/analyzer_clang_tidy.py b/libcodechecker/analyze/analyzers/analyzer_clang_tidy.py
@@ -102,11 +102,11 @@ def construct_analyzer_cmd(self, res_handler):
 
             analyzer_cmd.extend(self.buildaction.analyzer_options)
 
-            analyzer_cmd.extend(self.buildaction.compiler_includes)
-
             extend_analyzer_cmd_with_resource_dir(analyzer_cmd,
                                                   config.compiler_resource_dir)
 
+            analyzer_cmd.extend(self.buildaction.compiler_includes)
+
             return analyzer_cmd
 
         except Exception as ex:

diff --git a/libcodechecker/analyze/analyzers/analyzer_clangsa.py b/libcodechecker/analyze/analyzers/analyzer_clangsa.py
@@ -146,11 +146,11 @@ def construct_analyzer_cmd(self, result_handler):
 
             analyzer_cmd.extend(self.buildaction.analyzer_options)
 
-            analyzer_cmd.extend(self.buildaction.compiler_includes)
-
             extend_analyzer_cmd_with_resource_dir(analyzer_cmd,
                                                   config.compiler_resource_dir)
 
+            analyzer_cmd.extend(self.buildaction.compiler_includes)
+
             analyzer_cmd.append(self.source_file)
 
             return analyzer_cmd

diff --git a/libcodechecker/analyze/analyzers/ctu_triple_arch.py b/libcodechecker/analyze/analyzers/ctu_triple_arch.py
@@ -19,9 +19,9 @@ def get_compile_command(action, config, source='', output=''):
     for other operations. """
 
     cmd = [config.analyzer_binary]
-    cmd.extend(action.compiler_includes)
     extend_analyzer_cmd_with_resource_dir(cmd,
                                           config.compiler_resource_dir)
+    cmd.extend(action.compiler_includes)
     cmd.append('-c')
     cmd.extend(['-x', action.lang])
     cmd.append(config.analyzer_extra_arguments)