merge changes from ocaml3110 to ocaml3111rc0

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

1 files changed, 6 insertions, 2 deletions

diff --git a/driver/main.ml b/driver/main.ml
index eb79f4779a..7553b916e6 100644
--- a/driver/main.ml
+++ b/driver/main.ml
@@ -154,9 +154,13 @@ let main () =
     Arg.parse Options.list anonymous usage;
     if
       List.length (List.filter (fun x -> !x)
-		     [make_archive;make_package;compile_only;output_c_object]) > 1
+                      [make_archive;make_package;compile_only;output_c_object])
+        > 1
     then
-      fatal "Please specify at most one of -pack, -a, -c, -output-obj";
+      if !print_types then
+        fatal "Option -i is incompatible with -pack, -a, -output-obj"
+      else
+        fatal "Please specify at most one of -pack, -a, -c, -output-obj";
 
     if !make_archive then begin
       Compile.init_path();