Merge pull request #98 from fgyanz/extract-fix

Fix paths read from compiler_commands.json

Author: vmezzela

klpbuild/plugins/extractor.py

@@ -347,10 +347,12 @@ def get_cmd_from_json(self, cs, fname):
         for d in data:
             if fname in d["file"]:
                 output = d["command"]
-                # The arguments found on the file point to .., since they are generated
-                # when the kernel is compiled. Replace the .. by the codestream kernel source
-                # directory since klp-ccp needs to reach the files
-                return Extractor.process_make_output(output).replace("..", str(cs.get_src_dir()))
+                # The arguments found on the file point to '..', since they are generated
+                # when the kernel is compiled. Replace the first '..' on each file
+                # path by the codestream kernel source directory since klp-ccp needs to
+                # reach the files.
+                cmd = Extractor.process_make_output(output)
+                return cmd.replace(" ..", f" {str(cs.get_src_dir())}").replace("-I..", f"-I{str(cs.get_src_dir())}")
 
         raise RuntimeError(f"Couldn't find cmdline for {fname} on {str(cc_file)}. Aborting")