diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 416d999d0..99b86ffa4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 diff --git a/Makefile b/Makefile index 53f25281a..8399e7af2 100644 --- a/Makefile +++ b/Makefile @@ -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