[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, master, updated. debian/3.10.2-3-16-g2af942a

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 2af942a1a9de369365be8ad312845feb1138d9d5
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Nov 2 13:09:41 2008 +0100

    Revert "Embed bytecode in C object when using -custom"
    
    This reverts commit 5439795661016dd942b38d44acfd383dd10da236,
    pushed to git.debian.org by mistake.

diff --git a/bytecomp/bytelink.ml b/bytecomp/bytelink.ml
index e5afbd4..83add82 100644
--- a/bytecomp/bytelink.ml
+++ b/bytecomp/bytelink.ml
@@ -377,7 +377,7 @@ let output_data_string outchan data =
 
 (* Output a bytecode executable as a C file *)
 
-let link_bytecode_as_c tolink outfile with_main =
+let link_bytecode_as_c tolink outfile =
   let outchan = open_out outfile in
   try
     (* The bytecode *)
@@ -413,26 +413,14 @@ CAMLextern void caml_startup_code(
     (* The table of primitives *)
     Symtable.output_primitive_table outchan;
     (* The entry point *)
-    if with_main then begin
-      output_string outchan "\n
-int main(int argc, char **argv)
-{
-  caml_startup_code(caml_code, sizeof(caml_code),
-                    caml_data, sizeof(caml_data),
-                    caml_sections, sizeof(caml_sections),
-                    argv);
-  return 0; /* not reached */
-}\n"
-    end else begin
-      output_string outchan "\n
+    output_string outchan "\n
 void caml_startup(char ** argv)
 {
   caml_startup_code(caml_code, sizeof(caml_code),
                     caml_data, sizeof(caml_data),
                     caml_sections, sizeof(caml_sections),
                     argv);
-}\n"
-    end;
+}\n";
     close_out outchan
   with x ->
     close_out outchan;
@@ -510,16 +498,6 @@ let link objfiles output_name =
   Clflags.dllibs := !lib_dllibs @ !Clflags.dllibs; (* put user's DLLs first *)
   if not !Clflags.custom_runtime then
     link_bytecode tolink output_name true
-  else if not !Clflags.make_runtime then
-    let c_file = Filename.temp_file "camlobj" ".c" in
-    try
-      link_bytecode_as_c tolink c_file true;
-      let exec_name = fix_exec_name output_name in
-      if build_custom_runtime c_file exec_name <> 0
-      then raise(Error Custom_runtime);
-    with x ->
-      remove_file c_file;
-      raise x
   else if not !Clflags.output_c_object then begin
     let bytecode_name = Filename.temp_file "camlcode" "" in
     let prim_name = Filename.temp_file "camlprim" ".c" in
@@ -543,7 +521,7 @@ let link objfiles output_name =
       Filename.chop_suffix output_name Config.ext_obj ^ ".c" in
     if Sys.file_exists c_file then raise(Error(File_exists c_file));
     try
-      link_bytecode_as_c tolink c_file false;
+      link_bytecode_as_c tolink c_file;
       if Ccomp.compile_file c_file <> 0
       then raise(Error Custom_runtime);
       remove_file c_file

-- 
OCaml packaging