aboutsummaryrefslogtreecommitdiff
path: root/Makefile.build
diff options
context:
space:
mode:
authorEnrico Tassi2019-02-20 13:24:34 +0100
committerEnrico Tassi2019-02-20 13:24:34 +0100
commit756b978dfee0e0c103a5244af21115233ad96358 (patch)
tree937b01faf9e2aba41c1396f544d5d2a9ab3ec426 /Makefile.build
parentc39482e63aacf47359d8f76c44c2d851c7cfb9a5 (diff)
parent49ed4b7d3a01b9c383bb99fc26a7b34a7a711fdf (diff)
Merge PR #9560: [coqlib] Remove `-boot` option for setting the coqlib
Reviewed-by: SkySkimmer Ack-by: ejgallego Reviewed-by: gares
Diffstat (limited to 'Makefile.build')
-rw-r--r--Makefile.build5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.build b/Makefile.build
index ca988aaac2..8afb498a63 100644
--- a/Makefile.build
+++ b/Makefile.build
@@ -198,7 +198,10 @@ TIMER=$(if $(TIMED), $(STDTIME), $(TIMECMD))
# TIME="%C (%U user, %S sys, %e total, %M maxres)"
COQOPTS=$(NATIVECOMPUTE) $(COQWARNERROR) $(COQUSERFLAGS)
-BOOTCOQC=$(TIMER) $(COQC) -boot $(COQOPTS)
+# Beware this depends on the makefile being in a particular dir, we
+# should pass an absolute path here but windows is tricky
+# c.f. https://github.com/coq/coq/pull/9560
+BOOTCOQC=$(TIMER) $(COQC) -coqlib . -boot $(COQOPTS)
LOCALINCLUDES=$(addprefix -I ,$(SRCDIRS))
MLINCLUDES=$(LOCALINCLUDES)