diff options
| author | David Allsopp <david.allsopp@metastack.com> | 2016-01-02 14:49:08 +0000 |
|---|---|---|
| committer | David Allsopp <david.allsopp@metastack.com> | 2016-01-15 17:07:12 +0000 |
| commit | b46843fb697a1b0ff4540087a036f9dc03ec023e (patch) | |
| tree | ccff63f3da0995c514493d28b7632fef80f6e9bc /lex | |
| parent | fe4b643c4efd3fba18a1f0a9aba59dde0e4f7cde (diff) | |
| download | ocaml-b46843fb697a1b0ff4540087a036f9dc03ec023e.tar.gz | |
Allow compilation using bootstrapped FlexDLL
Extend the previous patch allowing make -f Makefile.nt flexdll
install-flexdll not to require the install-flexdll stage.
OCAML_FLEXLINK is utilised as required to allow compilation of the entire
system using an in-tree compiled flexlink. The build process simply
required the flexdll target to appear before world.
opt.opt compiles a native code version of flexlink.exe as flexlink.opt.
install always installs flexlink.exe if it was compiled along with any
required .manifest files. It also installs the appropriate .o/.obj files
to $(INSTALL_LIBDIR).
At present, the bootstrapping is not extended to the Cygwin ports.
Diffstat (limited to 'lex')
| -rw-r--r-- | lex/Makefile.nt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lex/Makefile.nt b/lex/Makefile.nt index 6bd8560406..768887809f 100644 --- a/lex/Makefile.nt +++ b/lex/Makefile.nt @@ -17,7 +17,7 @@ CAMLRUN ?= ../boot/ocamlrun CAMLYACC ?= ../boot/ocamlyacc CAMLC=$(CAMLRUN) ../boot/ocamlc -I ../boot -CAMLOPT=$(CAMLRUN) ../ocamlopt -I ../stdlib +CAMLOPT=$(if $(wildcard ../flexdll/Makefile),OCAML_FLEXLINK="../boot/ocamlrun ../flexdll/flexlink.exe") $(CAMLRUN) ../ocamlopt -I ../stdlib COMPFLAGS=-warn-error A LINKFLAGS= YACCFLAGS=-v |