1 files changed, 57 insertions, 8 deletions

diff --git a/ocamltest/ocaml_variables.ml b/ocamltest/ocaml_variables.ml
index 0374d21a5a..41bc206249 100644
--- a/ocamltest/ocaml_variables.ml
+++ b/ocamltest/ocaml_variables.ml
@@ -32,6 +32,9 @@ let all_modules = make ("all_modules",
 let binary_modules = make ("binary_modules",
   "Additional binary modules to link")
 
+let bytecc_libs = make ("bytecc_libs",
+  "Libraries to link with for bytecode")
+
 let c_preprocessor = make ("c_preprocessor",
   "Command to use to invoke the C preprocessor")
 
@@ -80,14 +83,9 @@ let compiler_stdin = make ("compiler_stdin",
 let compile_only = make ("compile_only",
   "Compile only (do not link)")
 
-let objext = make ("objext",
-  "Extension of object files")
-
-let ocamlc_flags = make ("ocamlc_flags",
-  "Flags passed to ocamlc.byte and ocamlc.opt")
+let csc = make ("csc", "Path to the CSharp compiler")
 
-let ocamlc_default_flags = make ("ocamlc_default_flags",
-  "Flags passed by default to ocamlc.byte and ocamlc.opt")
+let csc_flags = make ("csc_flags", "Flags for the CSharp compiler")
 
 let directories = make ("directories",
   "Directories to include by all the compilers")
@@ -95,15 +93,47 @@ let directories = make ("directories",
 let flags = make ("flags",
   "Flags passed to all the compilers")
 
+let last_flags = make ("last_flags",
+  "Flags passed to all the compilers at the end of the commandline")
+
 let libraries = make ("libraries",
   "Libraries the program should be linked with")
 
+let mkdll = make ("mkdll",
+  "Command to use to build a DLL")
+
+let mkexe = make ("mkexe",
+  "Command used to build an executable program DLL")
+
 let module_ = make ("module",
   "Compile one module at once")
 
 let modules = make ("modules",
   "Other modules of the test")
 
+let nativecc_libs = make ("nativecc_libs",
+  "Libraries to link with for native code")
+
+let objext = make ("objext",
+  "Extension of object files")
+
+let ocamlc_byte = make ("ocamlc_byte",
+  "Path of the ocamlc.byte executable")
+
+let ocamlopt_byte = make ("ocamlopt_byte",
+  "Path of the ocamlopt.byte executable")
+
+let ocamlrun = make ("ocamlrun",
+  "Path of the ocamlrun executable")
+
+let ocamlc_flags = make ("ocamlc_flags",
+  "Flags passed to ocamlc.byte and ocamlc.opt")
+
+let ocamlc_default_flags = make ("ocamlc_default_flags",
+  "Flags passed by default to ocamlc.byte and ocamlc.opt")
+
+
+
 let ocamllex_flags = make ("ocamllex_flags",
   "Flags passed to ocamllex")
 
@@ -178,6 +208,14 @@ let ocaml_script_as_argument =
 let plugins =
   Variables.make ( "plugins", "plugins for ocamlc,ocamlopt or ocamldoc" )
 
+let shared_library_cflags =
+  Variables.make ("shared_library_cflags",
+    "Flags used to compile C files for inclusion in shared libraries")
+
+let sharedobjext =
+  Variables.make ("sharedobjext",
+    "Extension of shared object files")
+
 let use_runtime =
   Variables.make ( "use_runtime", "Whether the -use-runtime option should be used" )
 
@@ -185,6 +223,7 @@ let _ = List.iter register_variable
   [
     all_modules;
     binary_modules;
+    bytecc_libs;
     c_preprocessor;
     caml_ld_library_path;
     compare_programs;
@@ -196,12 +235,20 @@ let _ = List.iter register_variable
     compiler_output2;
     compiler_stdin;
     compile_only;
+    csc;
+    csc_flags;
     directories;
     flags;
+    last_flags;
     libraries;
+    mkdll;
     module_;
     modules;
+    nativecc_libs;
     objext;
+    ocamlc_byte;
+    ocamlopt_byte;
+    ocamlrun;
     ocamlc_flags;
     ocamlc_default_flags;
     ocamlopt_flags;
@@ -213,7 +260,6 @@ let _ = List.iter register_variable
     ocamlc_opt_exit_status;
     ocamlopt_opt_exit_status;
     ocamlrunparam;
-    os_type;
     ocamllex_flags;
     ocamlyacc_flags;
     ocamldoc_flags;
@@ -224,6 +270,9 @@ let _ = List.iter register_variable
     ocamldebug_flags;
     ocamldebug_script;
     ocaml_script_as_argument;
+    os_type;
     plugins;
+    shared_library_cflags;
+    sharedobjext;
     use_runtime;
   ]