Skip to content

Commit 73748f8

Browse files
jeremiediminorgrinberg
authored andcommitted
Always pass -short-paths when calling ocamlc -i (#1743)
Fixes #1504 Signed-off-by: Jeremie Dimino <[email protected]>
1 parent 7445079 commit 73748f8

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

CHANGES.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
2323
- Get the correct environment node for multi project workspaces (#1648,
2424
@rgrinberg)
2525

26+
- Fix an issue causing menhir generated parsers to fail to build in
27+
some cases. The fix is to systematically use `-short-paths` when
28+
calling `ocamlc -i` (#1743, fix #1504, @diml)
29+
2630
1.6.2 (05/12/2018)
2731
------------------
2832

src/module_compilation.ml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ let ocamlc_i ?sandbox ?(flags=[]) ~dep_graphs cctx (m : Module.t) ~output =
210210
| Some (m : Module.t) ->
211211
As ["-open"; Module.Name.to_string (Module.name m)])
212212
; As flags
213+
; A "-short-paths"
213214
; A "-i"; Ml_kind.flag Impl; Dep src
214215
]
215216
>>^ (fun act -> Action.with_stdout_to output act)

0 commit comments

Comments
 (0)