diff options
| author |  Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr> | 2015-12-08 18:12:27 +0100 |
|---|---|---|
| committer | Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr> | 2015-12-08 18:12:27 +0100 |
| commit | e70165079e8defe490a568ece20a7029e4c1626e (patch) | |
| tree | 7e8ad97cbe6e06251fae9cc2da48acc8ab36d303 /Makefile.build | |
| parent | 071a458681254716a83b1802d5b6a30edda37892 (diff) | |
| parent | 19ea51a4b7f7debbe5bdeb2b2689cddadd9876f4 (diff) | |
Merge branch 'v8.5'
Diffstat (limited to 'Makefile.build')
| -rw-r--r-- | Makefile.build | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.build b/Makefile.build index f74bf1759..a3766a50f 100644 --- a/Makefile.build +++ b/Makefile.build @@ -133,9 +133,9 @@ SYSCMA:=$(addsuffix .cma,$(SYSMOD)) SYSCMXA:=$(addsuffix .cmxa,$(SYSMOD)) ifeq ($(CAMLP4),camlp5) -P4CMA:=gramlib.cma +P4CMA:=gramlib.cma str.cma else -P4CMA:=dynlink.cma camlp4lib.cma +P4CMA:=dynlink.cma camlp4lib.cma str.cma endif @@ -888,7 +888,7 @@ dev/printers.cma: | dev/printers.mllib.d $(HIDE)$(OCAMLC) $(MLINCLUDES) $(BYTEFLAGS) -thread $(SYSCMA) $(P4CMA) $^ -o test-printer @rm -f test-printer $(SHOW)'OCAMLC -a $@' - $(HIDE)$(OCAMLC) $(MLINCLUDES) $(BYTEFLAGS) -thread $(SYSCMA) $^ -linkall -a -o $@ + $(HIDE)$(OCAMLC) $(MLINCLUDES) $(BYTEFLAGS) -thread $(SYSCMA) $(P4CMA) $^ -linkall -a -o $@ grammar/grammar.cma: | grammar/grammar.mllib.d $(SHOW)'Testing $@' |