ocamldep: make printing of cyclic dependencies deterministic

Hashtbl.iter used to be deterministic, but it's now an observable
source of randomness.

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@16351 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

1 files changed, 7 insertions, 2 deletions

diff --git a/tools/ocamldep.ml b/tools/ocamldep.ml
index 0206846547..c57521d22f 100644
--- a/tools/ocamldep.ml
+++ b/tools/ocamldep.ml
@@ -440,14 +440,19 @@ let sort_files_by_dependencies files =
   if !worklist <> [] then begin
     Format.fprintf Format.err_formatter
       "@[Warning: cycle in dependencies. End of list is not sorted.@]@.";
-    Hashtbl.iter (fun _ (file, deps) ->
+    let sorted_deps =
+      let li = ref [] in
+      Hashtbl.iter (fun _ file_deps -> li := file_deps :: !li) h;
+      List.sort (fun (file1, _) (file2, _) -> String.compare file1 file2) !li
+    in
+    List.iter (fun (file, deps) ->
       Format.fprintf Format.err_formatter "\t@[%s: " file;
       List.iter (fun (modname, kind) ->
         Format.fprintf Format.err_formatter "%s.%s " modname
           (if kind=ML then "ml" else "mli");
       ) !deps;
       Format.fprintf Format.err_formatter "@]@.";
-      Printf.printf "%s " file) h;
+      Printf.printf "%s " file) sorted_deps;
   end;
   Printf.printf "\n%!";
   ()