diff options
| -rw-r--r-- | Changes | 3 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | lex/Makefile | 2 | ||||
| -rw-r--r-- | otherlibs/Makefile.shared | 2 | ||||
| -rw-r--r-- | otherlibs/dynlink/Makefile | 2 | ||||
| -rw-r--r-- | otherlibs/systhreads/Makefile | 2 | ||||
| -rw-r--r-- | otherlibs/threads/Makefile | 2 | ||||
| -rwxr-xr-x | stdlib/Makefile.shared | 4 |
8 files changed, 11 insertions, 8 deletions
@@ -8,6 +8,9 @@ Language features: - Generative functors - Module aliases +Build system for the OCaml distribution: +- Use -bin-annot when building. + Camlp4: - Removed from the official distribution @@ -17,7 +17,7 @@ include stdlib/StdlibModules CAMLC=boot/ocamlrun boot/ocamlc -nostdlib -I boot CAMLOPT=boot/ocamlrun ./ocamlopt -nostdlib -I stdlib -I otherlibs/dynlink -COMPFLAGS=-strict-sequence -w +33..39 -warn-error A $(INCLUDES) +COMPFLAGS=-strict-sequence -w +33..39 -warn-error A -bin-annot $(INCLUDES) LINKFLAGS= CAMLYACC=boot/ocamlyacc diff --git a/lex/Makefile b/lex/Makefile index debad6e61..f54de0020 100644 --- a/lex/Makefile +++ b/lex/Makefile @@ -13,7 +13,7 @@ # The lexer generator CAMLC=../boot/ocamlrun ../boot/ocamlc -strict-sequence -nostdlib -I ../boot CAMLOPT=../boot/ocamlrun ../ocamlopt -nostdlib -I ../stdlib -COMPFLAGS=-w +33..39 -warn-error A +COMPFLAGS=-w +33..39 -warn-error A -bin-annot CAMLYACC=../boot/ocamlyacc YACCFLAGS=-v CAMLLEX=../boot/ocamlrun ../boot/ocamllex diff --git a/otherlibs/Makefile.shared b/otherlibs/Makefile.shared index 4e8092f9b..751a15870 100644 --- a/otherlibs/Makefile.shared +++ b/otherlibs/Makefile.shared @@ -19,7 +19,7 @@ include $(ROOTDIR)/config/Makefile # Compilation options CC=$(BYTECC) CAMLRUN=$(ROOTDIR)/boot/ocamlrun -COMPFLAGS=-w +33..39 -warn-error A -g $(EXTRACAMLFLAGS) +COMPFLAGS=-w +33..39 -warn-error A -bin-annot -g $(EXTRACAMLFLAGS) MKLIB=$(CAMLRUN) $(ROOTDIR)/tools/ocamlmklib # Variables to be defined by individual libraries: diff --git a/otherlibs/dynlink/Makefile b/otherlibs/dynlink/Makefile index cb55c50cf..67b160aa4 100644 --- a/otherlibs/dynlink/Makefile +++ b/otherlibs/dynlink/Makefile @@ -18,7 +18,7 @@ include ../../config/Makefile CAMLC=../../boot/ocamlrun ../../ocamlc CAMLOPT=../../ocamlcompopt.sh INCLUDES=-I ../../utils -I ../../typing -I ../../bytecomp -I ../../asmcomp -COMPFLAGS=-w +33..39 -warn-error A -I ../../stdlib $(INCLUDES) +COMPFLAGS=-w +33..39 -warn-error A -bin-annot -I ../../stdlib $(INCLUDES) OBJS=dynlinkaux.cmo dynlink.cmo diff --git a/otherlibs/systhreads/Makefile b/otherlibs/systhreads/Makefile index d6b8686bc..3da02c260 100644 --- a/otherlibs/systhreads/Makefile +++ b/otherlibs/systhreads/Makefile @@ -16,7 +16,7 @@ include ../../config/Makefile CAMLC=../../ocamlcomp.sh -I ../unix CAMLOPT=../../ocamlcompopt.sh -I ../unix MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib -COMPFLAGS=-w +33..39 -warn-error A -g +COMPFLAGS=-w +33..39 -warn-error A -g -bin-annot BYTECODE_C_OBJS=st_stubs_b.o NATIVECODE_C_OBJS=st_stubs_n.o diff --git a/otherlibs/threads/Makefile b/otherlibs/threads/Makefile index 311373bbb..3aa6c2acf 100644 --- a/otherlibs/threads/Makefile +++ b/otherlibs/threads/Makefile @@ -17,7 +17,7 @@ CC=$(BYTECC) CFLAGS=-I../../byterun -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) -g CAMLC=../../ocamlcomp.sh -I ../unix MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib -COMPFLAGS=-w +33..39 -warn-error A +COMPFLAGS=-w +33..39 -warn-error A -bin-annot C_OBJS=scheduler.o diff --git a/stdlib/Makefile.shared b/stdlib/Makefile.shared index e9d5940a9..80c40d600 100755 --- a/stdlib/Makefile.shared +++ b/stdlib/Makefile.shared @@ -15,10 +15,10 @@ include ../config/Makefile RUNTIME=../boot/ocamlrun COMPILER=../ocamlc CAMLC=$(RUNTIME) $(COMPILER) -COMPFLAGS=-strict-sequence -w +33..39 -g -warn-error A -nostdlib +COMPFLAGS=-strict-sequence -w +33..39 -g -warn-error A -bin-annot -nostdlib OPTCOMPILER=../ocamlopt CAMLOPT=$(RUNTIME) $(OPTCOMPILER) -OPTCOMPFLAGS=-warn-error A -nostdlib -g +OPTCOMPFLAGS=-warn-error A -nostdlib -g -bin-annot CAMLDEP=../boot/ocamlrun ../tools/ocamldep OBJS=pervasives.cmo $(OTHERS) |