From 4261cc40270ee8abfa8ced859a8fb0b209cc78a8 Mon Sep 17 00:00:00 2001
From: Enrico Tassi
Date: Wed, 11 Feb 2015 17:59:50 +0100
Subject: Win: use .exe extension for the ocaml compiler (Close 3572)

---
 configure.ml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/configure.ml b/configure.ml
index 559e7ea1a7..0c1d39127f 100644
--- a/configure.ml
+++ b/configure.ml
@@ -77,7 +77,12 @@ let read_lines_and_close fd =
 
 type err = StdErr | StdOut | DevNull
 
+let exe = ref ""  (* Will be set later on, when the suffix is known *)
+
 let run ?(fatal=true) ?(err=StdErr) prog args =
+  let prog = (* Ensure prog ends with exe *)
+    if Str.string_match (Str.regexp ("^.*" ^ !exe ^ "$")) prog 0
+    then prog else (prog ^ !exe) in
   let argv = Array.of_list (prog::args) in
   try
     let out_r,out_w = Unix.pipe () in
@@ -431,7 +436,7 @@ let arch = match !Prefs.arch with
 
 let arch_win32 = (arch = "win32")
 
-let exe = if arch_win32 then ".exe" else ""
+let exe = exe := if arch_win32 then ".exe" else ""; !exe
 let dll = if os_type_win32 then ".dll" else ".so"
 
 (** * VCS
-- 
cgit v1.2.3