From 0e76cda958a4d3e4bcbb96e171c26b6b3478c6c2 Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
Date: Thu, 10 Feb 2022 16:44:10 +0100
Subject: [PATCH] Fix environment variable usage.

---
 boot/env.ml | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/boot/env.ml b/boot/env.ml
index e8521e7..d834a3a 100644
--- a/boot/env.ml
+++ b/boot/env.ml
@@ -32,17 +32,29 @@ let fail_msg =
 
 let fail s = Format.eprintf "%s@\n%!" fail_msg; exit 1
 
+let path_to_list p =
+  let sep = if String.equal Sys.os_type "Win32" then ';' else ':' in
+    String.split_on_char sep p
+
 (* This code needs to be refactored, for now it is just what used to be in envvars  *)
 let guess_coqlib () =
   Util.getenv_else "COQLIB" (fun () ->
   let prelude = "theories/Init/Prelude.vo" in
-  Util.check_file_else
-    ~dir:Coq_config.coqlibsuffix
-    ~file:prelude
-    (fun () ->
-      if Sys.file_exists (Filename.concat Coq_config.coqlib prelude)
-      then Coq_config.coqlib
-      else fail ()))
+  let coqlibpath = Util.getenv_else "COQLIBPATH" (fun () -> Coq_config.coqlibsuffix) in
+  let paths = path_to_list coqlibpath in
+  let valid_paths =
+    List.filter
+      (fun dir -> (Util.check_file_else ~dir:dir ~file:prelude (fun () -> "")) <> "")
+      paths in
+  match valid_paths with
+  | [] ->
+    if Sys.file_exists (Filename.concat Coq_config.coqlib prelude)
+    then Coq_config.coqlib
+    else
+      fail "cannot guess a path for Coq libraries; please use -coqlib option \
+            or ensure you have installed the package containing Coq's stdlib (coq-stdlib in OPAM) \
+            If you intend to use Coq without a standard library, the -boot -noinit options must be used."
+  | p::_ -> p)
 
 (* Build layout uses coqlib = coqcorelib *)
 let guess_coqcorelib lib =
-- 
2.34.0

ion>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=73302e3cae6284730878c887e355121aaaade799'>root</a>/<a href='/guix/log/po?id=73302e3cae6284730878c887e355121aaaade799'>po</a>/<a href='/guix/log/po/packages?id=73302e3cae6284730878c887e355121aaaade799'>packages</a>/<a href='/guix/log/po/packages/tr.po?id=73302e3cae6284730878c887e355121aaaade799'>tr.po</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/po/packages/tr.po?id=73302e3cae6284730878c887e355121aaaade799&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-07-31 21:08:46 +0200'>2023-07-31</span></td><td><a href='/guix/commit/po/packages/tr.po?id=39fbc041f92489ec30075a85937c8a38723752dc'>nls: Update translations.</a></td><td>Florian Pelz</td></tr>
<tr><td><span title='2023-05-31 17:23:21 +0200'>2023-05-31</span></td><td><a href='/guix/commit/po/packages/tr.po?id=8e9e6a6482f3ba98d1cdcad344ee488e8751fee7'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* doc/guix-cookbook.texi (Top): Mention Slovak.
</span></span></td><td>Florian Pelz</td></tr>
<tr><td><span title='2023-03-07 21:14:57 +0100'>2023-03-07</span></td><td><a href='/guix/commit/po/packages/tr.po?id=d333958763b0840c4cd895601b079b68358a6a46'>nls: Update translations.</a></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2022-12-04 22:25:23 +0100'>2022-12-04</span></td><td><a href='/guix/commit/po/packages/tr.po?id=2e75b328b6bbdadbffe5b643a4891b5026a0defd'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>po/packages/vi.po: New file.
po/packages/LINGUAS: Add it.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2022-11-04 10:56:38 +0100'>2022-11-04</span></td><td><a href='/guix/commit/po/packages/tr.po?id=a65ce9dd500460af4f97e7398fb35dd817f4c677'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/guix/lt.po: New file.
* po/guix/LINGUAS: Add lt.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2022-10-06 08:20:20 +0200'>2022-10-06</span></td><td><a href='/guix/commit/po/packages/tr.po?id=70fc8f6d619ce9f16a8cc0bbb10a011bd3a9997a'>nls: Update translations.</a></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2022-09-04 16:52:02 +0200'>2022-09-04</span></td><td><a href='/guix/commit/po/packages/tr.po?id=77e3042aef6d8e519d016555464e466399318b4f'>nls: Update translations.</a></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2022-08-10 23:32:24 +0200'>2022-08-10</span></td><td><a href='/guix/commit/po/packages/tr.po?id=aacbe59fbceb8a93ecb68fed8581dfdd70dafc11'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>po/guix/bn.po: New file.
po/guix/LINGUAS: Add it.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2022-07-09 21:49:34 +0200'>2022-07-09</span></td><td><a href='/guix/commit/po/packages/tr.po?id=e0d47d8facafb6d6c04741bbf30eefbc68aaefb9'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>po/guix/tr.po: New file.
po/guix/LINGUAS: Add it.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2022-06-04 17:42:54 +0200'>2022-06-04</span></td><td><a href='/guix/commit/po/packages/tr.po?id=809c57c872a6dd48007d1abf6d7f3dd1482ec53a'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>po/packages/tr.po: New file.
po/packages/LINGUAS: Add it.
</span></span></td><td>Julien Lepiller</td></tr>