Fix linking issue.

bschommer · bschommer · commit 7cf0cfac08fd · 2017-01-14T12:02:25.000+01:00
diff --git a/driver/compenv.ml b/driver/compenv.ml
@@ -553,7 +553,7 @@ let c_object_of_filename name =
   Filename.chop_suffix (Filename.basename name) ".c" ^ Config.ext_obj
 
 let process_action
-    (ppf, implementation, interface, ocaml_mod_ext, ocaml_lib_ext) action =
+    (ppf, implementation, interface, ocaml_mod_ext, ocaml_lib_ext, usage) action =
   match action with
   | ProcessImplementation name ->
       readenv ppf (Before_compile name);
@@ -585,9 +585,10 @@ let process_action
         ccobjs := name :: !ccobjs
       else if not !native_code && Filename.check_suffix name Config.ext_dll then
         dllibs := name :: !dllibs
-      else
-        raise(Arg.Bad("don't know what to do with " ^ name))
-
+      else begin
+        prerr_endline ("don't know what to do with " ^ name);
+        prerr_string usage
+      end
 
 let action_of_file name =
   if Filename.check_suffix name ".ml"
diff --git a/driver/compenv.mli b/driver/compenv.mli
@@ -74,5 +74,6 @@ val process_deferred_actions :
   (Format.formatter -> string -> string -> unit) * (* compile implementation *)
   (Format.formatter -> string -> string -> unit) * (* compile interface *)
   string * (* ocaml module extension *)
-  string -> (* ocaml library extension *)
+  string * (* ocaml library extension *)
+  string -> (* usage string for error message*)
   unit
diff --git a/driver/main.ml b/driver/main.ml
@@ -129,16 +129,14 @@ let main () =
   try
     readenv ppf Before_args;
     Arg.parse_expand Options.list anonymous usage;
-    try
+    let usage = Arg.usage_string Options.list usage in
       Compenv.process_deferred_actions
         (ppf,
          Compile.implementation,
          Compile.interface,
          ".cmo",
-         ".cma");
-    with Arg.Bad msg ->
-      prerr_endline msg;
-      Arg.usage Options.list usage;
+         ".cma",
+         usage);
     readenv ppf Before_link;
     if
       List.length (List.filter (fun x -> !x)
diff --git a/driver/optmain.ml b/driver/optmain.ml
@@ -240,16 +240,14 @@ let main () =
     Arg.parse_expand spec anonymous usage;
     if !gprofile && not Config.profiling then
       fatal "Profiling with \"gprof\" is not supported on this platform.";
-    try
-      Compenv.process_deferred_actions
-        (ppf,
-         Optcompile.implementation ~backend,
-         Optcompile.interface,
-         ".cmx",
-         ".cmxa");
-    with Arg.Bad msg ->
-      prerr_endline msg;
-      Arg.usage spec usage;
+    let usage = Arg.usage_string spec usage in
+    Compenv.process_deferred_actions
+      (ppf,
+       Optcompile.implementation ~backend,
+       Optcompile.interface,
+       ".cmx",
+       ".cmxa",
+       usage);
     readenv ppf Before_link;
     if
       List.length (List.filter (fun x -> !x)
