Merge remote-tracking branch 'origin/v8.5' into trunk

Conflicts:
	lib/cSig.mli

1 files changed, 5 insertions, 1 deletions

diff --git a/ide/project_file.ml4 b/ide/project_file.ml4
index 152f76cc0e..07ab5344d2 100644
--- a/ide/project_file.ml4
+++ b/ide/project_file.ml4
@@ -48,7 +48,7 @@ let parse f =
     res
 
 let rec process_cmd_line orig_dir ((project_file,makefile,install,opt) as opts) l = function
-  | [] -> opts,List.rev l
+  | [] -> opts, l
   | ("-h"|"--help") :: _ ->
     raise Parsing_error
   | ("-no-opt"|"-byte") :: r ->
@@ -128,6 +128,10 @@ let rec process_cmd_line orig_dir ((project_file,makefile,install,opt) as opts)
 	  else if (Filename.check_suffix f ".mlpack") then MLPACK f
 	  else Subdir f) :: l) r
 
+let process_cmd_line orig_dir opts l args =
+  let (opts, l) = process_cmd_line orig_dir opts l args in
+  opts, List.rev l
+
 let rec post_canonize f =
   if Filename.basename f = Filename.current_dir_name
   then let dir = Filename.dirname f in