From d6328c16a949e3f390bc3d6b16061722ca0fe423 Mon Sep 17 00:00:00 2001 From: Jeremie Dimino Date: Mon, 7 Jan 2019 14:45:40 +0000 Subject: [PATCH] Always pass -short-paths when calling `ocamlc -i` Fixes #1504 Signed-off-by: Jeremie Dimino --- CHANGES.md | 4 ++++ src/module_compilation.ml | 1 + 2 files changed, 5 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 13e0d230182..4ca8a60394a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -66,6 +66,10 @@ unreleased - Let `Configurator` handle `sizeof` (in addition to negative numbers). (#1726, fixes #1723, @Chris00) +- 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 index 40903b72335..fd6a449db4a 100644 --- a/src/module_compilation.ml +++ b/src/module_compilation.ml @@ -214,6 +214,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)