Terminate ocamlrun argument parsing with --

ocaml · Feb 4, 2020 · 086380d · 086380d
1 parent cad5476
commit 086380d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Changes b/Changes
@@ -18,8 +18,9 @@ Working version
   a breaking change if the configuration system was being abused before).
   (David Allsopp, review by Xavier Leroy)
 
-* #10098: Improve command-line parsing in ocamlrun: strictly recognise options
-  and be more informative for `ocamlrun -I`.
+* #10098: Improve command-line parsing in ocamlrun: strictly recognise options,
+  be more informative for `ocamlrun -I` and support `--` for terminating options
+  parsing.
   (David Allsopp, review by Xavier Leroy)
 
 ### Code generation and optimizations:

diff --git a/runtime/startup_byt.c b/runtime/startup_byt.c
@@ -285,6 +285,9 @@ static int parse_command_line(char_os **argv)
     if (len == 2) {
       /* Single-letter options, e.g. -v */
       switch(argv[i][1]) {
+      case '-':
+        return i + 1;
+        break;
       case 't':
         ++ caml_trace_level; /* ignored unless DEBUG mode */
         break;