Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #535 from dra27/fix-507 

Fix bootstrapped FlexDLL build
master
Alain Frisch 2016-04-12 16:35:46 +02:00
parent de724f051c cd729b2510
commit de530188cb
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lex/Makefile
View File

@ -18,6 +18,8 @@ include ../config/Makefile
CAMLRUN ?= ../boot/ocamlrun
CAMLYACC ?= ../boot/ocamlyacc
ROOTDIR=..
ifeq "$(wildcard $(ROOTDIR)/flexdll/Makefile)" ""
export OCAML_FLEXLINK:=
else
@ -47,7 +49,7 @@ ocamllex.opt: $(OBJS:.cmo=.cmx)
clean::
rm -f ocamllex ocamllex.opt
rm -f *.cmo *.cmi *.cmx *.cmt *.cmti *.o *~
rm -f *.cmo *.cmi *.cmx *.cmt *.cmti *.$(O) *~
parser.ml parser.mli: parser.mly
$(CAMLYACC) $(YACCFLAGS) parser.mly

8
tools/Makefile.shared
View File

@ -17,6 +17,14 @@ include ../config/Makefile
CAMLRUN ?= ../boot/ocamlrun
CAMLYACC ?= ../boot/ocamlyacc
ROOTDIR=..
ifeq "$(wildcard $(ROOTDIR)/flexdll/Makefile)" ""
export OCAML_FLEXLINK:=
else
export OCAML_FLEXLINK:=$(ROOTDIR)/boot/ocamlrun $(ROOTDIR)/flexdll/flexlink.exe
endif
CAMLC=$(CAMLRUN) ../boot/ocamlc -nostdlib -I ../boot -use-prims ../byterun/primitives
CAMLOPT=$(CAMLRUN) ../ocamlopt -nostdlib -I ../stdlib
CAMLLEX=$(CAMLRUN) ../boot/ocamllex