diff options
| author | Stephen Dolan <mu@netsoc.tcd.ie> | 2019-03-22 12:22:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-22 12:22:14 +0000 |
| commit | f495bfb7cbc78fa4fecbcceb7ca2942582fc07a4 (patch) | |
| tree | b069dbb1b9c83e62522673454c235aeea9b2845c /tools | |
| parent | 6db4eadc5ef2f134962be2c058366de2d1ce28b1 (diff) | |
| parent | 9acd54e668e5bb7e7225d1c84192876c1ede83ad (diff) | |
| download | ocaml-f495bfb7cbc78fa4fecbcceb7ca2942582fc07a4.tar.gz | |
Merge pull request #8514 from stedolan/boot-ocamlc-opt
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 |