Merge PR #12567: [build] Split stdlib to it's own package.

Reviewed-by: Zimmi48
Ack-by: JasonGross
Ack-by: gares
Ack-by: LasseBlaauwbroek
Ack-by: silene
Ack-by: vbgl

1 files changed, 4 insertions, 1 deletions

diff --git a/lib/envars.ml b/lib/envars.ml
index 1702b5d7a2..823d255f58 100644
--- a/lib/envars.ml
+++ b/lib/envars.ml
@@ -132,7 +132,9 @@ let guess_coqlib fail =
       if not Coq_config.local && Sys.file_exists (Coq_config.coqlib / prelude)
       then Coq_config.coqlib
       else
-        fail "cannot guess a path for Coq libraries; please use -coqlib option")
+        fail "cannot guess a path for Coq libraries; please use -coqlib option \
+              or ensure you have installed the package contaning Coq's stdlib (coq-stdlib in OPAM) \
+              If you intend to use Coq without a standard library, the -boot -noinit options must be used.")
   )
 
 let coqlib : string option ref = ref None
@@ -205,6 +207,7 @@ let print_config ?(prefix_var_name="") f coq_src_subdirs =
   let open Printf in
   fprintf f "%sLOCAL=%s\n" prefix_var_name (if Coq_config.local then "1" else "0");
   fprintf f "%sCOQLIB=%s/\n" prefix_var_name (coqlib ());
+  fprintf f "%sCOQCORELIB=%s/\n" prefix_var_name (if Coq_config.local then coqlib () else coqlib () / "../coq-core/");
   fprintf f "%sDOCDIR=%s/\n" prefix_var_name (docdir ());
   fprintf f "%sOCAMLFIND=%s\n" prefix_var_name (ocamlfind ());
   fprintf f "%sCAMLFLAGS=%s\n" prefix_var_name Coq_config.caml_flags;