diff options
| -rw-r--r-- | driver/main.ml | 2 | ||||
| -rw-r--r-- | driver/main_args.ml | 6 | ||||
| -rw-r--r-- | driver/main_args.mli | 2 | ||||
| -rw-r--r-- | driver/optmain.ml | 4 | ||||
| -rw-r--r-- | otherlibs/labltk/support/Makefile.common | 4 | ||||
| -rw-r--r-- | otherlibs/labltk/support/Makefile.common.nt | 4 | ||||
| -rw-r--r-- | tools/ocamlcp.ml | 2 | ||||
| -rw-r--r-- | toplevel/topdirs.ml | 2 | ||||
| -rw-r--r-- | toplevel/topmain.ml | 4 | ||||
| -rw-r--r-- | utils/clflags.ml | 2 |
10 files changed, 16 insertions, 16 deletions
diff --git a/driver/main.ml b/driver/main.ml index 7710f7fe6..400d9608f 100644 --- a/driver/main.ml +++ b/driver/main.ml @@ -76,7 +76,7 @@ module Options = Main_args.Make_options (struct let _impl = impl let _intf = intf let _intf_suffix s = Config.interface_suffix := s - let _label = unset classic + let _labels = unset classic let _linkall = set link_everything let _make_runtime () = custom_runtime := true; make_runtime := true; link_everything := true diff --git a/driver/main_args.ml b/driver/main_args.ml index 6e4614d6c..d32b5b935 100644 --- a/driver/main_args.ml +++ b/driver/main_args.ml @@ -26,7 +26,7 @@ module Make_options (F : val _impl : string -> unit val _intf : string -> unit val _intf_suffix : string -> unit - val _label : unit -> unit + val _labels : unit -> unit val _linkall : unit -> unit val _make_runtime : unit -> unit val _noassert : unit -> unit @@ -69,13 +69,13 @@ struct "<file> Suffix for interface files (default: .mli)"; "-intf_suffix", Arg.String F._intf_suffix, "<file> (deprecated) same as -intf-suffix"; - "-label", Arg.Unit F._label, " Use strict label syntax"; + "-labels", Arg.Unit F._labels, " Use commuting label mode"; "-linkall", Arg.Unit F._linkall, " Link all modules, even unused ones"; "-make-runtime", Arg.Unit F._make_runtime, " Build a runtime system with given C objects and libraries"; "-make_runtime", Arg.Unit F._make_runtime, " (deprecated) same as -make-runtime"; - "-modern", Arg.Unit F._label, " (deprecated) same as -label"; + "-modern", Arg.Unit F._labels, " (deprecated) same as -labels"; "-noassert", Arg.Unit F._noassert, " Don't compile assertion checks"; "-noautolink", Arg.Unit F._noautolink, " Don't automatically link C libraries specified in .cma files"; diff --git a/driver/main_args.mli b/driver/main_args.mli index d77589d75..deda71d3e 100644 --- a/driver/main_args.mli +++ b/driver/main_args.mli @@ -26,7 +26,7 @@ module Make_options (F : val _impl : string -> unit val _intf : string -> unit val _intf_suffix : string -> unit - val _label : unit -> unit + val _labels : unit -> unit val _linkall : unit -> unit val _make_runtime : unit -> unit val _noassert : unit -> unit diff --git a/driver/optmain.ml b/driver/optmain.ml index b4620fb79..92529a9af 100644 --- a/driver/optmain.ml +++ b/driver/optmain.ml @@ -82,10 +82,10 @@ let main () = "<file> Suffix for interface files (default: .mli)"; "-intf_suffix", Arg.String (fun s -> Config.interface_suffix := s), "<file> (deprecated) same as -intf-suffix"; - "-label", Arg.Clear classic, " Use strict label syntax"; + "-labels", Arg.Clear classic, " Use commuting label mode"; "-linkall", Arg.Set link_everything, " Link all modules, even unused ones"; - "-modern", Arg.Clear classic, " (deprecated) same as -label"; + "-modern", Arg.Clear classic, " (deprecated) same as -labels"; "-noassert", Arg.Set noassert, " Don't compile assertion checks"; "-noautolink", Arg.Set no_auto_link, " Don't automatically link C libraries specified in .cma files"; diff --git a/otherlibs/labltk/support/Makefile.common b/otherlibs/labltk/support/Makefile.common index 2012b2f31..eae4fbd4a 100644 --- a/otherlibs/labltk/support/Makefile.common +++ b/otherlibs/labltk/support/Makefile.common @@ -15,7 +15,7 @@ TKLINKOPT=$(STATIC) \ CAMLRUN=$(TOPDIR)/boot/ocamlrun LABLC=$(CAMLRUN) $(TOPDIR)/ocamlc -I $(TOPDIR)/stdlib -LABLCOMP=$(LABLC) -label -c +LABLCOMP=$(LABLC) -labels -c LABLYACC=$(TOPDIR)/boot/ocamlyacc -v LABLLEX=$(CAMLRUN) $(TOPDIR)/boot/ocamllex LABLLIBR=$(LABLC) -a @@ -23,5 +23,5 @@ LABLDEP=$(CAMLRUN) $(TOPDIR)/tools/ocamldep COMPFLAGS= LINKFLAGS= -CAMLOPT=$(CAMLRUN) $(TOPDIR)/ocamlopt -I $(TOPDIR)/stdlib -label +CAMLOPT=$(CAMLRUN) $(TOPDIR)/ocamlopt -I $(TOPDIR)/stdlib -labels CAMLOPTLIBR=$(CAMLOPT) -a diff --git a/otherlibs/labltk/support/Makefile.common.nt b/otherlibs/labltk/support/Makefile.common.nt index 8853f0035..98f30283e 100644 --- a/otherlibs/labltk/support/Makefile.common.nt +++ b/otherlibs/labltk/support/Makefile.common.nt @@ -16,7 +16,7 @@ TKLINKOPT=$(STATIC) CAMLRUN=$(EXEDIR)\boot\ocamlrun LABLC=$(CAMLRUN) $(TOPDIR)/ocamlc -I $(TOPDIR)/stdlib -LABLCOMP=$(LABLC) -label -c +LABLCOMP=$(LABLC) -labels -c LABLYACC=$(EXEDIR)\boot\ocamlyacc -v LABLLEX=$(CAMLRUN) $(TOPDIR)/boot/ocamllex LABLLIBR=$(LABLC) -a @@ -24,5 +24,5 @@ LABLDEP=$(CAMLRUN) $(TOPDIR)/tools/ocamldep COMPFLAGS= LINKFLAGS= -CAMLOPT=$(CAMLRUN) $(TOPDIR)/ocamlopt -I $(TOPDIR)/stdlib -label +CAMLOPT=$(CAMLRUN) $(TOPDIR)/ocamlopt -I $(TOPDIR)/stdlib -labels CAMLOPTLIBR=$(CAMLOPT) -a diff --git a/tools/ocamlcp.ml b/tools/ocamlcp.ml index cef50dc75..b2f147c45 100644 --- a/tools/ocamlcp.ml +++ b/tools/ocamlcp.ml @@ -45,7 +45,7 @@ module Options = Main_args.Make_options (struct let _impl s = option_with_arg "-impl" s let _intf s = option_with_arg "-intf" s let _intf_suffix s = option_with_arg "-intf-suffix" s - let _label = option "-label" + let _labels = option "-labels" let _linkall = option "-linkall" let _make_runtime = option "-make-runtime" let _noassert = option "-noassert" diff --git a/toplevel/topdirs.ml b/toplevel/topdirs.ml index b21a12ec4..9f6127837 100644 --- a/toplevel/topdirs.ml +++ b/toplevel/topdirs.ml @@ -241,7 +241,7 @@ let _ = (* Set various compiler flags *) - Hashtbl.add directive_table "label" + Hashtbl.add directive_table "labels" (Directive_bool(fun b -> Clflags.classic := not b)); Hashtbl.add directive_table "warnings" diff --git a/toplevel/topmain.ml b/toplevel/topmain.ml index 186c9f8e7..173c087f1 100644 --- a/toplevel/topmain.ml +++ b/toplevel/topmain.ml @@ -23,8 +23,8 @@ let main () = Arg.parse [ "-I", Arg.String(fun dir -> include_dirs := dir :: !include_dirs), "<dir> Add <dir> to the list of include directories"; - "-label", Arg.Clear classic, " Use strict label syntax"; - "-modern", Arg.Clear classic, " (deprecated) same as -label"; + "-labels", Arg.Clear classic, " Use commuting label mode"; + "-modern", Arg.Clear classic, " (deprecated) same as -labels"; "-noassert", Arg.Set noassert, " Do not compile assertion checks"; "-rectypes", Arg.Set recursive_types, " Allow arbitrary recursive types"; "-unsafe", Arg.Set fast, " No bound checking on array and string access"; diff --git a/utils/clflags.ml b/utils/clflags.ml index ae315f385..c3e79c420 100644 --- a/utils/clflags.ml +++ b/utils/clflags.ml @@ -30,7 +30,7 @@ and link_everything = ref false (* -linkall *) and custom_runtime = ref false (* -custom *) and output_c_object = ref false (* -output-obj *) and ccopts = ref ([] : string list) (* -ccopt *) -and classic = ref true (* -label *) +and classic = ref true (* -labels *) and nopervasives = ref false (* -nopervasives *) and preprocessor = ref(None : string option) (* -pp *) and thread_safe = ref false (* -thread *) |