diff options
| author | Emilio Jesus Gallego Arias | 2018-07-03 10:31:09 +0200 |
|---|---|---|
| committer | Emilio Jesus Gallego Arias | 2018-07-03 10:31:09 +0200 |
| commit | 543aa308f4adcd6365b2390e258dde1e3f21b861 (patch) | |
| tree | 63ec1a539bf88412495b778037dd42039297282c | |
| parent | ce848730137bd1bf1f12f88ec782c935e742d84c (diff) | |
| parent | 200fbd0cec4709bd1fb5f7a32e1c40270e343b5a (diff) | |
Merge PR #7977: allow `make check` to succeed when -prefix is given to ./configure and make install not run yet
| -rw-r--r-- | lib/envars.ml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/envars.ml b/lib/envars.ml index be82bfe9bb..3ee0c7106b 100644 --- a/lib/envars.ml +++ b/lib/envars.ml @@ -110,6 +110,7 @@ let check_file_else ~dir ~file oth = if Sys.file_exists (path / file) then path else oth () let guess_coqlib fail = + getenv_else "COQLIB" (fun () -> let prelude = "theories/Init/Prelude.vo" in check_file_else ~dir:Coq_config.coqlibsuffix ~file:prelude (fun () -> @@ -117,6 +118,7 @@ let guess_coqlib fail = then Coq_config.coqlib else fail "cannot guess a path for Coq libraries; please use -coqlib option") + ) (** coqlib is now computed once during coqtop initialization *) |