Merge pull request #2309 from TheLortex/runtime-variant-path

gasche · web-flow · commit 010d94cae21d · 2019-06-19T16:12:28.000+02:00
Add -noruntime option
diff --git a/Changes b/Changes
@@ -128,6 +128,11 @@ OCaml 4.09.0
   (Jules Aguillon, with help from Armaël Guéneau,
    review by Gabriel Scherer and Florian Angeletti)
 
+- #2309: New options -with-runtime and -without-runtime in ocamlopt/ocamlc
+  that control the inclusion of the runtime system in the generated program.
+  (Lucas Pluvinage, review by Daniel Bünzli, Damien Doligez, David Allsopp
+   and Florian Angeletti)
+
 - #2314: Remove support for gprof profiling.
   (Mark Shinwell, review by Xavier Clerc and Stephen Dolan)
 
diff --git a/asmcomp/asmlink.ml b/asmcomp/asmlink.ml
@@ -111,7 +111,7 @@ let add_ccobjs origin l =
 let runtime_lib () =
   let libname = "libasmrun" ^ !Clflags.runtime_variant ^ ext_lib in
   try
-    if !Clflags.nopervasives then []
+    if !Clflags.nopervasives || not !Clflags.with_runtime then []
     else [ Load_path.find libname ]
   with Not_found ->
     raise(Error(File_not_found libname))
diff --git a/bytecomp/bytelink.ml b/bytecomp/bytelink.ml
@@ -304,14 +304,15 @@ let link_bytecode ?final_name tolink exec_name standalone =
       raise (Error (Wrong_object_name exec_name));
     | _ -> ()) tolink;
   Misc.remove_file exec_name; (* avoid permission problems, cf PR#8354 *)
+  let outperm = if !Clflags.with_runtime then 0o777 else 0o666 in
   let outchan =
     open_out_gen [Open_wronly; Open_trunc; Open_creat; Open_binary]
-                 0o777 exec_name in
+                 outperm exec_name in
   Misc.try_finally
     ~always:(fun () -> close_out outchan)
     ~exceptionally:(fun () -> remove_file exec_name)
     (fun () ->
-       if standalone then begin
+       if standalone && !Clflags.with_runtime then begin
          (* Copy the header *)
          let header =
            if String.length !Clflags.use_runtime > 0
@@ -327,7 +328,8 @@ let link_bytecode ?final_name tolink exec_name standalone =
        end;
        Bytesections.init_record outchan;
        (* The path to the bytecode interpreter (in use_runtime mode) *)
-       if String.length !Clflags.use_runtime > 0 then begin
+       if String.length !Clflags.use_runtime > 0 && !Clflags.with_runtime then
+       begin
          let runtime = make_absolute !Clflags.use_runtime in
          let runtime =
            (* shebang mustn't exceed 128 including the #! and \0 *)
@@ -541,7 +543,10 @@ let link_bytecode_as_c tolink outfile =
 (* Build a custom runtime *)
 
 let build_custom_runtime prim_name exec_name =
-  let runtime_lib = "-lcamlrun" ^ !Clflags.runtime_variant in
+  let runtime_lib =
+    if not !Clflags.with_runtime
+    then ""
+    else "-lcamlrun" ^ !Clflags.runtime_variant in
   let debug_prefix_map =
     if Config.c_has_debug_prefix_map && not !Clflags.keep_camlprimc_file then
       [Printf.sprintf "-fdebug-prefix-map=%s=camlprim.c" prim_name]
@@ -665,7 +670,10 @@ let link objfiles output_name =
                else Ccomp.MainDll, Config.bytecomp_c_libraries
              in
              if not (
-                 let runtime_lib = "-lcamlrun" ^ !Clflags.runtime_variant in
+                 let runtime_lib =
+                   if not !Clflags.with_runtime
+                   then ""
+                   else "-lcamlrun" ^ !Clflags.runtime_variant in
                  Ccomp.call_linker mode output_name
                    ([obj_file] @ List.rev !Clflags.ccobjs @ [runtime_lib])
                    c_libs
diff --git a/driver/compenv.ml b/driver/compenv.ml
@@ -232,6 +232,7 @@ let read_one_param ppf position name v =
 
   | "pp" -> preprocessor := Some v
   | "runtime-variant" -> runtime_variant := v
+  | "with-runtime" -> set "with-runtime" [ with_runtime ] v
   | "open" ->
       open_modules := List.rev_append (String.split_on_char ',' v) !open_modules
   | "cc" -> c_compiler := Some v
diff --git a/driver/main.ml b/driver/main.ml
@@ -101,6 +101,8 @@ module Options = Main_args.Make_bytecomp_options (struct
   let _rectypes = set recursive_types
   let _no_rectypes = unset recursive_types
   let _runtime_variant s = runtime_variant := s
+  let _with_runtime = set with_runtime
+  let _without_runtime = unset with_runtime
   let _safe_string = unset unsafe_string
   let _short_paths = unset real_paths
   let _strict_sequence = set strict_sequence
diff --git a/driver/main_args.ml b/driver/main_args.ml
@@ -454,6 +454,16 @@ let mk_runtime_variant f =
   "<str>  Use the <str> variant of the run-time system"
 ;;
 
+let mk_with_runtime f =
+  "-with-runtime", Arg.Unit f,
+  "Include the runtime system in the generated program (default)"
+;;
+
+let mk_without_runtime f =
+  "-without-runtime", Arg.Unit f,
+  "Do not include the runtime system in the generated program."
+;;
+
 let mk_S f =
   "-S", Arg.Unit f, " Keep intermediate assembly file"
 ;;
@@ -930,6 +940,8 @@ module type Compiler_options = sig
   val _no_principal : unit -> unit
   val _rectypes : unit -> unit
   val _runtime_variant : string -> unit
+  val _with_runtime : unit -> unit
+  val _without_runtime : unit -> unit
   val _safe_string : unit -> unit
   val _short_paths : unit -> unit
   val _thread : unit -> unit
@@ -1144,6 +1156,8 @@ struct
     mk_rectypes F._rectypes;
     mk_no_rectypes F._no_rectypes;
     mk_runtime_variant F._runtime_variant;
+    mk_with_runtime F._with_runtime;
+    mk_without_runtime F._without_runtime;
     mk_safe_string F._safe_string;
     mk_short_paths F._short_paths;
     mk_strict_sequence F._strict_sequence;
@@ -1332,6 +1346,8 @@ struct
     mk_remove_unused_arguments F._remove_unused_arguments;
     mk_rounds F._rounds;
     mk_runtime_variant F._runtime_variant;
+    mk_with_runtime F._with_runtime;
+    mk_without_runtime F._without_runtime;
     mk_S F._S;
     mk_safe_string F._safe_string;
     mk_shared F._shared;
diff --git a/driver/main_args.mli b/driver/main_args.mli
@@ -96,6 +96,8 @@ module type Compiler_options = sig
   val _no_principal : unit -> unit
   val _rectypes : unit -> unit
   val _runtime_variant : string -> unit
+  val _with_runtime : unit -> unit
+  val _without_runtime : unit -> unit
   val _safe_string : unit -> unit
   val _short_paths : unit -> unit
   val _thread : unit -> unit
diff --git a/driver/optmain.ml b/driver/optmain.ml
@@ -181,6 +181,8 @@ module Options = Main_args.Make_optcomp_options (struct
   let _no_rectypes = clear recursive_types
   let _remove_unused_arguments = set remove_unused_arguments
   let _runtime_variant s = runtime_variant := s
+  let _with_runtime = set with_runtime
+  let _without_runtime = clear with_runtime
   let _safe_string = clear unsafe_string
   let _short_paths = clear real_paths
   let _strict_sequence = set strict_sequence
diff --git a/man/ocamlc.m b/man/ocamlc.m
@@ -1056,6 +1056,13 @@ compilation in any way (even if it is fatal).  If a warning is enabled,
 .B \-where
 Print the location of the standard library, then exit.
 .TP
+.B \-with-runtime
+Include the runtime system in the generated program. This is the default.
+.TP
+.B \-without-runtime
+The compiler does not include the runtime system (nor a reference to it) in the
+generated program; it must be supplied separately.
+.TP
 .BI \- \ file
 Process
 .I file
diff --git a/man/ocamlopt.m b/man/ocamlopt.m
@@ -684,6 +684,13 @@ Print the version number of the compiler in short form (e.g. "3.11.0"),
 .B \-where
 Print the location of the standard library, then exit.
 .TP
+.B \-with-runtime
+Include the runtime system in the generated program. This is the default.
+.TP
+.B \-without-runtime
+The compiler does not include the runtime system (nor a reference to it) in the
+generated program; it must be supplied separately.
+.TP
 .BI \- \ file
 Process
 .I file
diff --git a/manual/manual/cmds/unified-options.etex b/manual/manual/cmds/unified-options.etex
@@ -779,6 +779,17 @@ Show the description of all available warning numbers.
 Print the location of the standard library, then exit.
 }%notop
 
+\notop{%
+\item["-with-runtime"]
+Include the runtime system in the generated program. This is the default.
+}
+
+\notop{%
+\item["-without-runtime"]
+The compiler does not include the runtime system (nor a reference to it) in the
+generated program; it must be supplied separately.
+}
+
 \item["-" \var{file}]
 \notop{Process \var{file} as a file name, even if it starts with a dash ("-")
 character.}
diff --git a/tools/ocamlcp.ml b/tools/ocamlcp.ml
@@ -87,6 +87,8 @@ module Options = Main_args.Make_bytecomp_options (struct
   let _rectypes = ignore
   let _no_rectypes = ignore
   let _runtime_variant = ignore
+  let _with_runtime = ignore
+  let _without_runtime = ignore
   let _safe_string = ignore
   let _short_paths = ignore
   let _strict_sequence = ignore
diff --git a/tools/ocamloptp.ml b/tools/ocamloptp.ml
@@ -108,6 +108,8 @@ module Options = Main_args.Make_optcomp_options (struct
   let _no_rectypes = ignore
   let _remove_unused_arguments = ignore
   let _runtime_variant = ignore
+  let _with_runtime = ignore
+  let _without_runtime = ignore
   let _S = ignore
   let _safe_string = ignore
   let _short_paths = ignore
diff --git a/utils/clflags.ml b/utils/clflags.ml
@@ -163,6 +163,7 @@ let pic_code = ref (match Config.architecture with (* -fPIC *)
                      | _       -> false)
 
 let runtime_variant = ref "";;      (* -runtime-variant *)
+let with_runtime = ref true;;         (* -with-runtime *)
 
 let keep_docs = ref false              (* -keep-docs *)
 let keep_locs = ref true               (* -keep-locs *)
diff --git a/utils/clflags.mli b/utils/clflags.mli
@@ -185,6 +185,7 @@ val shared : bool ref
 val dlcode : bool ref
 val pic_code : bool ref
 val runtime_variant : string ref
+val with_runtime : bool ref
 val force_slash : bool ref
 val keep_docs : bool ref
 val keep_locs : bool ref
