From 574866af2ef30f9383dcf58231a5a08ff41ee5d5 Mon Sep 17 00:00:00 2001
From: David Allsopp <david.allsopp@metastack.com>
Date: Tue, 13 Jun 2017 14:17:40 +0200
Subject: [PATCH] Correct detected value for ocaml on Windows

---
 src/bin.mli    | 3 +++
 src/context.ml | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/bin.mli b/src/bin.mli
index 8b2139fc..94fce500 100644
--- a/src/bin.mli
+++ b/src/bin.mli
@@ -8,6 +8,9 @@ val parse_path : string -> Path.t list
 (** The opam tool *)
 val opam : Path.t option
 
+(** Extension to append to executable filenames *)
+val exe : string
+
 (** Look for a program in the PATH *)
 val which : ?path:Path.t list -> string -> Path.t option
 
diff --git a/src/context.ml b/src/context.ml
index 043c6762..3c962ef5 100644
--- a/src/context.ml
+++ b/src/context.ml
@@ -311,7 +311,7 @@ let create ~(kind : Kind.t) ~path ~base_env ~env_extra ~name ~merlin ~use_findli
     ; toplevel_path = Option.map (get_env env "OCAML_TOPLEVEL_PATH") ~f:Path.absolute
 
     ; ocaml_bin  = dir
-    ; ocaml      = Path.relative dir "ocaml"
+    ; ocaml      = Path.relative dir ("ocaml" ^ Bin.exe)
     ; ocamlc
     ; ocamlopt   = best_prog "ocamlopt"
     ; ocamldep   = get_prog  "ocamldep"