Skip to content

Adapt to coq/coq#15693#355

Merged
gares merged 1 commit intoLPCIC:coq-masterfrom
proux01:coq_15693
May 3, 2022
Merged

Adapt to coq/coq#15693#355
gares merged 1 commit intoLPCIC:coq-masterfrom
proux01:coq_15693

Conversation

@proux01
Copy link
Copy Markdown
Contributor

@proux01 proux01 commented Mar 27, 2022

To be merged in sync with the upstream PR rocq-prover/rocq#15693

I had to comment a line in the Makefile for the installation to work properly in the CI of Coq

Makefile Outdated
COQDOCINSTALL ?= $(DESTDIR)$(DOCDIR)/user-contrib

export DESTDIR
#export DESTDIR
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ahah yes, srry, but I think this is not the right fix. I think the split between DESTDIR and DOCDIR was wrong...
Is it supposed to be

DESTDIR ?= $(shell $(COQBIN)/coqc -where)/../
DOCDIR ?= ../share/doc/coq-elpi/

maybe?
CC @gares

@proux01
Copy link
Copy Markdown
Contributor Author

proux01 commented Mar 28, 2022

Is there a difference between ifndef X \n X=V \n endif and X?=V? If not, the latter avoids any risk of mispelling one of the two instances of X.

@gares
Copy link
Copy Markdown
Contributor

gares commented Mar 28, 2022

I don't think there is any. But when we did that change we had an extra export and I'm not so sure if exporting an empty variable is the same as not exporting it. Then the code changed and the ifdef stayd :-/

@gares gares merged commit ee028f5 into LPCIC:coq-master May 3, 2022
@ppedrot
Copy link
Copy Markdown
Collaborator

ppedrot commented May 3, 2022

@gares Coq-elpi still seems to be broken on master after this overlay, see e.g. https://gitlab.com/coq/coq/-/jobs/2406603188. Stupid me can't read.

@proux01 proux01 deleted the coq_15693 branch May 3, 2022 09:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants