diff options
| author | pboutill | 2012-06-15 17:52:01 +0000 |
|---|---|---|
| committer | pboutill | 2012-06-15 17:52:01 +0000 |
| commit | 55e6ed2761dbbb3e2e550ed6fb728193f39e836a (patch) | |
| tree | f166be439ff1c78353f5bd70a40346712055d2aa | |
| parent | f5c65bb6ff3d20dbec5b672b996b42a9e3a36697 (diff) | |
Partialy revert "coq_makefile fixup" because old Makefiles still need CAMLP4BIN
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@15441 85f007b7-540e-0410-9357-904b9bb8a0f7
| -rw-r--r-- | lib/envars.mli | 1 | ||||
| -rw-r--r-- | toplevel/usage.ml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/envars.mli b/lib/envars.mli index fbcbfe72af..e99fd8e03e 100644 --- a/lib/envars.mli +++ b/lib/envars.mli @@ -26,5 +26,6 @@ val xdg_dirs : warn:(string -> unit) -> string list val coqpath : string list val camlbin : unit -> string +val camlp4bin : unit -> string val camllib : unit -> string val camlp4lib : unit -> string diff --git a/toplevel/usage.ml b/toplevel/usage.ml index 9c05124644..dcf11354b4 100644 --- a/toplevel/usage.ml +++ b/toplevel/usage.ml @@ -100,6 +100,7 @@ let print_config () = Printf.printf "CAMLLIB=%s/\n" (Envars.camllib ()); Printf.printf "CAMLP4=%s\n" Coq_config.camlp4; Printf.printf "CAMLP4O=%s\n" Coq_config.camlp4o; + Printf.printf "CAMLP4BIN=%s/\n" (Envars.camlp4bin ()); Printf.printf "CAMLP4LIB=%s\n" (Envars.camlp4lib ()); Printf.printf "CAMLP4OPTIONS=%s\n" Coq_config.camlp4compat; Printf.printf "HASNATDYNLINK=%s\n" (if Coq_config.has_natdynlink then "true" else "false") |