summarylogtreecommitdiffstats
path: root/fix-ocaml-4.08.patch
blob: 725aeae88a996be681ca72b2ef88f1ee6dd3d7fa (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34

--- FStar-0.9.7.0-alpha1/src/tactics/ml/FStar_Tactics_Load.ml2	2019-10-20 16:32:25.391276735 +0200
+++ FStar-0.9.7.0-alpha1/src/tactics/ml/FStar_Tactics_Load.ml	2019-10-20 16:33:25.817940824 +0200
@@ -5,21 +5,6 @@

 let loaded_taclib = ref false

-(* We had weird failures, so don't trust in Dynlink.error_message *)
-let error_message : Dynlink.error -> string =
-    fun e ->
-    let s = match e with
-    | Not_a_bytecode_file _ -> "Not_a_bytecode_file"
-    | Inconsistent_import _ -> "Inconsistent_import"
-    | Unavailable_unit _ -> "Unavailable_unit"
-    | Unsafe_file -> "Unsafe_file"
-    | Linking_error _ -> "Linking_error"
-    | Corrupted_interface _ -> "Corrupted_interface"
-    | File_not_found _ -> "File_not_found"
-    | Cannot_open_dll _ -> "Cannot_open_dll"
-    | Inconsistent_implementation _ -> "Inconsistent_implementation"
-    in s ^ ": " ^ Dynlink.error_message e
-
 let find_taclib () =
   let r = Process.run "ocamlfind" [| "query"; "fstar-tactics-lib" |] in
   match r with
@@ -35,7 +20,7 @@
       print_string ("Loading plugin from " ^ fname ^ "\n");
       Dynlink.loadfile fname
     with Dynlink.Error e ->
-      failwith (U.format2 "Dynlinking %s failed: %s" fname (error_message e)) in
+      failwith (U.format2 "Dynlinking %s failed: %s" fname (Dynlink.error_message e)) in

   if not !loaded_taclib then begin
     dynlink (find_taclib () ^ "/fstartaclib.cmxs");