Skip to content

Commit

Permalink
Try better config method
Browse files Browse the repository at this point in the history
  • Loading branch information
ejgallego committed Sep 26, 2023
1 parent 05d4e68 commit 0892995
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ jobs:
- name: 🐫🐪🐫 Get dependencies
run: opam exec -- make opam-deps

- name: Configure coq-lsp natively with Windows paths
run: opam exec -- make winconfig

- name: 🧱 Build coq-lsp
run: opam exec -- make build

Expand Down
18 changes: 15 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,21 @@ build-all: coq_boot

# We set -libdir due to a Coq bug on win32, see https://github.com/coq/coq/pull/17289
vendor/coq/config/coq_config.ml:
cd vendor/coq \
&& ./configure -no-ask -prefix $(shell pwd)/_build/install/default/ \
-libdir $(shell pwd)/_build/install/default/lib/coq \
EPATH=$(shell pwd) \
&& cd vendor/coq \
&& ./configure -no-ask -prefix "$$EPATH/_build/install/default/" \
-libdir "$$EPATH/_build/install/default/lib/coq" \
-native-compiler no \
&& cp theories/dune.disabled theories/dune \
&& cp user-contrib/Ltac2/dune.disabled user-contrib/Ltac2/dune

# We set windows parameters a bit better
.PHONY: winconfig
winconfig:
EPATH=$(shell cygpath -aw .) \
&& cd vendor/coq \
&& ./configure -no-ask -prefix "$$EPATH\\_build\\install\\default\\" \
-libdir "$$EPATH\\_build\\install\\default\\lib\\coq\\" \
-native-compiler no \
&& cp theories/dune.disabled theories/dune \
&& cp user-contrib/Ltac2/dune.disabled user-contrib/Ltac2/dune
Expand Down

0 comments on commit 0892995

Please sign in to comment.