Always pass -short-paths when calling ocamlc -i (#1743)

Fixes #1504 Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
ocaml · Jan 8, 2019 · 73748f8 · 73748f8
1 parent 7445079
commit 73748f8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -23,6 +23,10 @@
 - Get the correct environment node for multi project workspaces (#1648,
   @rgrinberg)
 
+- Fix an issue causing menhir generated parsers to fail to build in
+  some cases. The fix is to systematically use `-short-paths` when
+  calling `ocamlc -i` (#1743, fix #1504, @diml)
+
 1.6.2 (05/12/2018)
 ------------------
 

diff --git a/src/module_compilation.ml b/src/module_compilation.ml
@@ -210,6 +210,7 @@ let ocamlc_i ?sandbox ?(flags=[]) ~dep_graphs cctx (m : Module.t) ~output =
           | Some (m : Module.t) ->
             As ["-open"; Module.Name.to_string (Module.name m)])
        ; As flags
+       ; A "-short-paths"
        ; A "-i"; Ml_kind.flag Impl; Dep src
        ]
      >>^ (fun act -> Action.with_stdout_to output act)