diff options
| author | Matej Kosik | 2015-12-07 16:25:58 +0100 |
|---|---|---|
| committer | Matej Kosik | 2015-12-07 19:22:10 +0100 |
| commit | 19ea51a4b7f7debbe5bdeb2b2689cddadd9876f4 (patch) | |
| tree | ca2443aca25b3d9e4e354b5fd488792b0fbd7084 | |
| parent | df3a49a18c5b01984000df9244ecea9c275b30cd (diff) | |
Fixing a minor problem in Makefile.build that was prevening "dev/printers.cma" to be loadable within "ocamldebug".
| -rw-r--r-- | Makefile.build | 6 | ||||
| -rw-r--r-- | dev/db | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/Makefile.build b/Makefile.build index 98ef81f38c..00ff6a7a4c 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 @@ -882,7 +882,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 $@' @@ -1,5 +1,3 @@ -load_printer "gramlib.cma" -load_printer "str.cma" load_printer "printers.cma" install_printer Top_printers.ppfuture |