diff options
| -rw-r--r-- | Makefile.nt | 6 | ||||
| -rw-r--r-- | config/Makefile.mingw | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Makefile.nt b/Makefile.nt index b435f70b6..0b9e4e7c2 100644 --- a/Makefile.nt +++ b/Makefile.nt @@ -28,6 +28,9 @@ CAMLDEP=boot/ocamlrun tools/ocamldep DEPFLAGS=$(INCLUDES) CAMLRUN=byterun/ocamlrun +CAMLP4OUT=$(CAMLP4:=out) +CAMLP4OPT=$(CAMLP4:=opt) + INCLUDES=-I utils -I parsing -I typing -I bytecomp -I asmcomp -I driver \ -I toplevel @@ -121,7 +124,8 @@ defaultentry: @echo "Please refer to the installation instructions in file README.win32." # Recompile the system using the bootstrap compiler -all: runtime ocamlc ocamllex ocamlyacc ocamltools library ocaml otherlibraries ocamldoc.byte ocamlbuild.byte $(CAMLP4OUT) $(DEBUGGER) +all: runtime ocamlc ocamllex ocamlyacc ocamltools library ocaml \ + otherlibraries ocamldoc.byte ocamlbuild.byte $(CAMLP4OUT) $(DEBUGGER) # The compilation of ocaml will fail if the runtime has changed. # Never mind, just do make bootstrap to reach fixpoint again. diff --git a/config/Makefile.mingw b/config/Makefile.mingw index 29d14f6e6..c83b7dbc7 100644 --- a/config/Makefile.mingw +++ b/config/Makefile.mingw @@ -19,6 +19,9 @@ PREFIX=C:/ocamlmgw +### Remove this to disable compiling camlp4 +CAMLP4=camlp4 + ### Where to install the binaries BINDIR=$(PREFIX)/bin @@ -78,6 +81,7 @@ EXTRALIBS= NATDYNLINK=true CMXS=cmxs RUNTIMED=noruntimed +ASM_CFI_SUPPORTED=true ########## Configuration for the bytecode compiler |