Merge PR #8572: [config] Miscellaneous cleaning of configuration variables.

1 files changed, 0 insertions, 12 deletions

diff --git a/configure.ml b/configure.ml
index 48e55546d1..a508ac6071 100644
--- a/configure.ml
+++ b/configure.ml
@@ -1183,13 +1183,11 @@ let write_configml f =
   let pr_i = pr "let %s = %d\n" in
   let pr_p s o = pr "let %s = %S\n" s
     (match o with Relative s -> s | Absolute s -> s) in
-  let pr_l  n l = pr "let %s = [%s]\n" n (String.concat ";" (List.map (fun s -> "\"" ^ s ^ "\"") l)) in
   let pr_li n l = pr "let %s = [%s]\n" n (String.concat ";" (List.map string_of_int l)) in
   pr "(* DO NOT EDIT THIS FILE: automatically generated by ../configure *)\n";
   pr "(* Exact command that generated this file: *)\n";
   pr "(* %s *)\n\n" (String.concat " " (Array.to_list Sys.argv));
   pr_b "local" !prefs.local;
-  pr "let vmbyteflags = ["; List.iter (pr "%S;") vmbyteflags; pr "]\n";
   pr_s "coqlib" coqlib;
   pr_s "configdir" configdir;
   pr_s "datadir" datadir;
@@ -1198,18 +1196,12 @@ let write_configml f =
   pr_p "configdirsuffix" configdirsuffix;
   pr_p "datadirsuffix" datadirsuffix;
   pr_p "docdirsuffix" docdirsuffix;
-  pr_s "ocaml" camlexec.top;
   pr_s "ocamlfind" camlexec.find;
-  pr_s "ocamllex" camlexec.lex;
-  pr_s "camlbin" camlbin;
-  pr_s "camllib" camllib;
   pr_s "camlp5o" camlp5o;
   pr_s "camlp5bin" camlp5bindir;
   pr_s "camlp5lib" camlp5libdir;
   pr_s "camlp5compat" camlp5compat;
-  pr_s "cflags" cflags;
   pr_s "caml_flags" caml_flags;
-  pr_s "best" best_compiler;
   pr_s "version" coq_version;
   pr_s "caml_version" caml_version;
   pr_li "caml_version_nums" caml_version_nums;
@@ -1218,12 +1210,8 @@ let write_configml f =
   pr_s "arch" arch;
   pr_b "arch_is_win32" arch_is_win32;
   pr_s "exec_extension" exe;
-  pr_s "coqideincl" !lablgtkincludes;
-  pr_s "has_coqide" coqide;
   pr "let gtk_platform = `%s\n" !idearchdef;
   pr_b "has_natdynlink" hasnatdynlink;
-  pr_s "natdynlinkflag" natdynlinkflag;
-  pr_l "flambda_flags" !prefs.flambda_flags;
   pr_i "vo_magic_number" vo_magic;
   pr_i "state_magic_number" state_magic;
   pr_s "browser" browser;