aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Maxime Dénès <mail@maximedenes.fr>2018-05-29 22:12:34 +0200
committerGravatar Maxime Dénès <mail@maximedenes.fr>2018-05-29 22:12:34 +0200
commit853917631d58226d9669af64203901e2b19ed304 (patch)
tree8501b25829e78c3abf83a900f1a8561b90e51bd6
parentb073a2ceebe1d332d27852b6504cd809d21613b8 (diff)
parent2ccec00285b3bf67d230eedda120cd72c328cfbb (diff)
Merge PR #7593: Don't try to install native compiled files if native-compile is not set
-rw-r--r--Makefile.install2
-rw-r--r--Makefile.vofiles7
2 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.install b/Makefile.install
index 0764b61fc..984cfc05c 100644
--- a/Makefile.install
+++ b/Makefile.install
@@ -82,7 +82,7 @@ endif
install-tools:
$(MKDIR) $(FULLBINDIR)
- # recopie des fichiers de style pour coqide
+ # copy style files for coqide
$(MKDIR) $(FULLCOQLIB)/tools/coqdoc
$(INSTALLLIB) tools/coqdoc/coqdoc.css tools/coqdoc/coqdoc.sty $(FULLCOQLIB)/tools/coqdoc
$(INSTALLBIN) $(TOOLS) $(FULLBINDIR)
diff --git a/Makefile.vofiles b/Makefile.vofiles
index fc902c4a8..b1e97e991 100644
--- a/Makefile.vofiles
+++ b/Makefile.vofiles
@@ -30,9 +30,10 @@ vo_to_cm = $(foreach vo,$(1),$(dir $(vo)).coq-native/$(subst /,_,$(patsubst theo
vo_to_obj = $(foreach vo,$(1),$(dir $(vo)).coq-native/$(subst /,_,$(patsubst theories/%,NCoq_%,$(patsubst plugins/%,NCoq_%,$(vo:.vo=.o)))))
GLOBFILES:=$(ALLVO:.vo=.glob)
-LIBFILES:=$(ALLVO) $(call vo_to_cm,$(ALLVO)) \
- $(call vo_to_obj,$(ALLVO)) \
- $(VFILES) $(GLOBFILES)
+ifdef NATIVECOMPUTE
+NATIVEFILES := $(call vo_to_cm,$(ALLVO)) $(call vo_to_obj,$(ALLVO))
+endif
+LIBFILES:=$(ALLVO) $(NATIVEFILES) $(VFILES) $(GLOBFILES)
# For emacs:
# Local Variables: