diff options
| author | Fabrice Le Fessant <Fabrice.Le_fessant@inria.fr> | 2013-02-18 12:09:06 +0000 |
|---|---|---|
| committer | Fabrice Le Fessant <Fabrice.Le_fessant@inria.fr> | 2013-02-18 12:09:06 +0000 |
| commit | 8364a09153255933c8b8783f611220fe0f4f39ce (patch) | |
| tree | 454290ca08b1ec9baced5d37517dd4b5aab29552 | |
| parent | 0a9bf33ba3ae789cb55df6605a5ea13aef15af7e (diff) | |
| download | ocaml-8364a09153255933c8b8783f611220fe0f4f39ce.tar.gz | |
PR#5461: fix warnings 31 in camlp4 compilation
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13296 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | .depend | 2 | ||||
| -rwxr-xr-x | build/boot.sh | 6 | ||||
| -rwxr-xr-x | build/camlp4-native-only.sh | 6 |
3 files changed, 10 insertions, 4 deletions
@@ -49,8 +49,6 @@ parsing/lexer.cmo : utils/warnings.cmi parsing/parser.cmi utils/misc.cmi \ parsing/location.cmi parsing/lexer.cmi parsing/lexer.cmx : utils/warnings.cmx parsing/parser.cmx utils/misc.cmx \ parsing/location.cmx parsing/lexer.cmi -parsing/linenum.cmo : utils/misc.cmi -parsing/linenum.cmx : utils/misc.cmx parsing/location.cmo : utils/warnings.cmi utils/terminfo.cmi \ parsing/location.cmi parsing/location.cmx : utils/warnings.cmx utils/terminfo.cmx \ diff --git a/build/boot.sh b/build/boot.sh index 5d1feca7ea..c0d49a2847 100755 --- a/build/boot.sh +++ b/build/boot.sh @@ -15,7 +15,11 @@ cd `dirname $0`/.. set -ex TAG_LINE='true: -use_stdlib' -./boot/ocamlrun boot/myocamlbuild.boot \ + +# If you modify this list, modify it also in camlp4-native-only.sh +STDLIB_MODULES='Pervasives,Arg,Array,Buffer,Char,Digest,Filename,Format,Hashtbl,Lazy,Lexing,List,Map,Printexc,Printf,Scanf,Set,String,Sys,Parsing,Int32,Int64,Nativeint,Obj,Queue,Sort,Stream,Stack' + +./boot/ocamlrun boot/myocamlbuild.boot -ignore "$STDLIB_MODULES" \ -tag-line "$TAG_LINE" \ boot/stdlib.cma boot/std_exit.cmo diff --git a/build/camlp4-native-only.sh b/build/camlp4-native-only.sh index 513a99165c..d53395c238 100755 --- a/build/camlp4-native-only.sh +++ b/build/camlp4-native-only.sh @@ -16,4 +16,8 @@ set -e cd `dirname $0`/.. . build/targets.sh set -x -$OCAMLBUILD $@ native_stdlib_mixed_mode $OCAMLOPT_BYTE $OCAMLLEX_BYTE $CAMLP4_NATIVE + +# If you modify this list, modify it also in boot.sh +STDLIB_MODULES='Pervasives,Arg,Array,Buffer,Char,Digest,Filename,Format,Hashtbl,Lazy,Lexing,List,Map,Printexc,Printf,Scanf,Set,String,Sys,Parsing,Int32,Int64,Nativeint,Obj,Queue,Sort,Stream,Stack' + +$OCAMLBUILD -ignore "$STDLIB_MODULES" $@ native_stdlib_mixed_mode $OCAMLOPT_BYTE $OCAMLLEX_BYTE $CAMLP4_NATIVE |