aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorglondu2008-08-16 10:43:25 +0000
committerglondu2008-08-16 10:43:25 +0000
commit9cba6dace05b3698541ac93ef0f38e43afabb3f6 (patch)
tree8af5d7531faec1ca0317d3e7a9847be99fc5e9ae
parent26a8b0de6e7daef17f113c30e02a9aae43edddfc (diff)
Fix build/install failures when ocamlopt is not available
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@11325 85f007b7-540e-0410-9357-904b9bb8a0f7
-rw-r--r--Makefile.build7
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.build b/Makefile.build
index 7c20876348..d4e021d431 100644
--- a/Makefile.build
+++ b/Makefile.build
@@ -655,7 +655,10 @@ install-library:
$(MKDIR) $(FULLCOQLIB)/states
$(INSTALLLIB) states/*.coq $(FULLCOQLIB)/states
$(MKDIR) $(FULLCOQLIB)/user-contrib
- $(INSTALLLIB) $(LINKCMO) $(LINKCMX) $(GRAMMARCMA) $(FULLCOQLIB)
+ $(INSTALLLIB) $(LINKCMO) $(GRAMMARCMA) $(FULLCOQLIB)
+ifeq ($(BEST),opt)
+ $(INSTALLLIB) $(LINKCMX) $(FULLCOQLIB)
+endif
find . -name \*.cmi -exec $(INSTALLLIB) {} $(FULLCOQLIB) \;
install-library-light:
@@ -716,7 +719,7 @@ dev/printers.cma: $(PRINTERSCMO)
parsing/grammar.cma: $(GRAMMARCMO)
$(SHOW)'Testing $@'
@touch test.ml4
- $(HIDE)$(OCAMLOPT) $(OPTFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENDFLAGS) $(GRAMMARCMO) -impl" -impl test.ml4 -o test-grammar
+ $(HIDE)$(OCAMLC) $(OPTFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENDFLAGS) $(GRAMMARCMO) -impl" -impl test.ml4 -o test-grammar
@rm -f test-grammar test.*
$(SHOW)'OCAMLC -a $@'
$(HIDE)$(OCAMLC) $(BYTEFLAGS) $(GRAMMARCMO) -linkall -a -o $@