From cae2790d7bede8393e98427c833609a7b1bd3c4a Mon Sep 17 00:00:00 2001
From: Andre Maroneze <andre.oliveiramaroneze@cea.fr>
Date: Mon, 22 Jun 2020 22:57:29 +0200
Subject: [PATCH] [Kernel] fix usage of is_relative in JCDB paths
---
src/kernel_services/ast_queries/json_compilation_database.ml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/kernel_services/ast_queries/json_compilation_database.ml b/src/kernel_services/ast_queries/json_compilation_database.ml
index 6aeaf28c650..091216de519 100644
--- a/src/kernel_services/ast_queries/json_compilation_database.ml
+++ b/src/kernel_services/ast_queries/json_compilation_database.ml
@@ -136,7 +136,7 @@ let parse_entry jcdb_dir r =
let filename = r |> member "file" |> to_string in
let dirname = r |> member "directory" |> to_string_option |> Extlib.opt_conv jcdb_dir in
let dirname =
- if Filepath.is_relative dirname then Filename.concat jcdb_dir dirname
+ if Filename.is_relative dirname then Filename.concat jcdb_dir dirname
else dirname
in
let dirname = Filepath.normalize dirname in
@@ -164,7 +164,7 @@ let parse_entry jcdb_dir r =
in
(* conversion for '-I' flags *)
let convert_path arg =
- if Filepath.is_relative arg then Filename.concat dirname arg
+ if Filename.is_relative arg then Filename.concat dirname arg
else arg
in
let convert_define arg =
--
GitLab