Commits

camlspotter  committed 86adfe1 Merge

merge

  • Participants
  • Parent commits c9869a2, 8472326
  • Branches custom

Comments (0)

Files changed (3)

-4.00.0+beta2+camlp4-lexer-plug
+4.00.0+beta2+camlp4-lexer-plug+annot
 
 # The version string is the first line of this file.
 # It must be in the format described in stdlib/sys.mli

File driver/main.ml

 
 let main () =
   try
+    (* OCAML_ANNOT env variable to turn on -annot by default *)
+    (try ignore (Sys.getenv "OCAML_ANNOT"); 
+         Clflags.annotations := true;
+         Clflags.binary_annotations := true;
+    with Not_found -> ()); 
     Arg.parse Options.list anonymous usage;
     if
       List.length (List.filter (fun x -> !x)

File driver/optmain.ml

   native_code := true;
   let ppf = Format.err_formatter in
   try
+    (* OCAML_ANNOT env variable to turn on -annot by default *)
+    (try ignore (Sys.getenv "OCAML_ANNOT"); 
+         Clflags.annotations := true;
+         Clflags.binary_annotations := true;
+    with Not_found -> ()); 
     Arg.parse (Arch.command_line_options @ Options.list) anonymous usage;
     if
       List.length (List.filter (fun x -> !x)