Skip to content

Commit

Permalink
Stop reading env var COQ_CONFIGURE_PREFIX
Browse files Browse the repository at this point in the history
Discussion in coq#15459 indicates that it
didn't work in opam (which is why we stopped using it), and with the
renaming we want to stop reading COQ* env vars when possible.
  • Loading branch information
SkySkimmer committed Dec 18, 2024
1 parent eafed8f commit 11508e3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
4 changes: 2 additions & 2 deletions config/dune
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@
%{project_root}/dev/header.c
; Needed to generate include lists for coq_makefile
plugin_list
(env_var PWD) ; used in the fallback of COQ_CONFIGURE_PREFIX
(env_var COQ_CONFIGURE_PREFIX))
; used for the prefix
(env_var PWD))
(action (chdir %{project_root} (run %{project_root}/tools/configure/configure.exe -no-ask))))
8 changes: 2 additions & 6 deletions tools/configure/configure.ml
Original file line number Diff line number Diff line change
Expand Up @@ -281,12 +281,8 @@ let install_dirs prefs arch =
let prefix =
match prefs.prefix with
| None ->
begin
try Some (Sys.getenv "COQ_CONFIGURE_PREFIX")
with
| Not_found when prefs.interactive -> None
| Not_found -> Some Sys.(getcwd () ^ "/../install/default")
end
if prefs.interactive then None
else Some Sys.(getcwd () ^ "/../install/default")
| p -> p
in
List.map (do_one_instdir ~prefix ~arch) (install prefs)
Expand Down

0 comments on commit 11508e3

Please sign in to comment.