diff options
| author | Stephen Dolan <stephen.dolan@cl.cam.ac.uk> | 2019-03-18 10:45:43 +0000 |
|---|---|---|
| committer | Stephen Dolan <stephen.dolan@cl.cam.ac.uk> | 2019-03-20 10:31:46 +0000 |
| commit | 46c427f519ed3af18dccbb82b1c522b4e0716cc4 (patch) | |
| tree | 6aa05893beaced3426f1fddc42409c6bc460680e /tools | |
| parent | c413136fa31f60576dc781706eded63525bf3185 (diff) | |
| download | ocaml-46c427f519ed3af18dccbb82b1c522b4e0716cc4.tar.gz | |
Use boot/ocamlc.opt for building, if available.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/Makefile b/tools/Makefile index 5501ac2751..b078df22f4 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -26,7 +26,6 @@ endef $(foreach i,BINDIR LIBDIR STUBLIBDIR MANDIR,$(eval $(shellquote))) endif -CAMLRUN ?= $(ROOTDIR)/boot/ocamlrun DESTDIR ?= # Setup GNU make variables storing per-target source and target, # a list of installed tools, and a function to quote a filename for @@ -73,7 +72,7 @@ $(eval $(call \ byte_and_opt_,$(subst $$,$$$$,$1),$(subst $$,$$$$,$2),$(subst $$,$$$$,$3))) endef -CAMLC = $(CAMLRUN) $(ROOTDIR)/boot/ocamlc -g -nostdlib -I $(ROOTDIR)/boot \ +CAMLC = $(BOOT_OCAMLC) -g -nostdlib -I $(ROOTDIR)/boot \ -use-prims $(ROOTDIR)/runtime/primitives -I $(ROOTDIR) CAMLOPT = $(CAMLRUN) $(ROOTDIR)/ocamlopt -g -nostdlib -I $(ROOTDIR)/stdlib CAMLLEX = $(CAMLRUN) $(ROOTDIR)/boot/ocamllex @@ -427,7 +426,7 @@ clean:: clean:: rm -f *.cmo *.cmi *.cma *.dll *.so *.lib *.a -CAMLDEP=$(CAMLRUN) $(ROOTDIR)/boot/ocamlc -depend +CAMLDEP=$(BOOT_OCAMLC) -depend DEPFLAGS=-slash DEPINCLUDES=$(INCLUDES) depend: beforedepend |