diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2009-05-20 11:52:42 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2009-05-20 11:52:42 +0000 |
| commit | ed32f569e3b636e0f12efdbbd5bba9e05cc434ac (patch) | |
| tree | 20b551901a72edf7733a6fe5287deab21ed9b83b /otherlibs/labltk/support | |
| parent | 7795eafa896b0c5b3066d5efec7ec49d69d44e4d (diff) | |
merge changes from ocaml3110 to ocaml3111rc0
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9270 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'otherlibs/labltk/support')
| -rw-r--r-- | otherlibs/labltk/support/Makefile.common | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/otherlibs/labltk/support/Makefile.common b/otherlibs/labltk/support/Makefile.common index 215804826..56f6fd137 100644 --- a/otherlibs/labltk/support/Makefile.common +++ b/otherlibs/labltk/support/Makefile.common @@ -13,8 +13,10 @@ INSTALLDIR=$(LIBDIR)/$(LIBNAME) ## Tools from the Objective Caml distribution CAMLRUN=$(TOPDIR)/boot/ocamlrun -CAMLC=$(CAMLRUN) $(TOPDIR)/ocamlc -nostdlib -I $(TOPDIR)/stdlib -CAMLOPT=$(CAMLRUN) $(TOPDIR)/ocamlopt -nostdlib -I $(TOPDIR)/stdlib +CAMLC=$(TOPDIR)/ocamlcomp.sh +CAMLOPT=$(TOPDIR)/ocamlcompopt.sh +CAMLCB=$(CAMLRUN) $(TOPDIR)/ocamlc +CAMLOPTB=$(CAMLRUN) $(TOPDIR)/ocamlopt CAMLCOMP=$(CAMLC) -c -warn-error A CAMLYACC=$(TOPDIR)/boot/ocamlyacc -v CAMLLEX=$(CAMLRUN) $(TOPDIR)/boot/ocamllex |