diff options
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/ccomp.ml | 2 | ||||
| -rw-r--r-- | utils/config.mlp | 12 | ||||
| -rw-r--r-- | utils/misc.ml | 5 |
3 files changed, 8 insertions, 11 deletions
diff --git a/utils/ccomp.ml b/utils/ccomp.ml index 1e065666bc..f98ba6985d 100644 --- a/utils/ccomp.ml +++ b/utils/ccomp.ml @@ -25,7 +25,7 @@ let command cmdline = let run_command cmdline = ignore(command cmdline) (* Build @responsefile to work around Windows limitations on - command-length line *) + command-line length *) let build_diversion lst = let (responsefile, oc) = Filename.open_temp_file "camlresp" "" in List.iter diff --git a/utils/config.mlp b/utils/config.mlp index 370adbc387..599f5eca1c 100644 --- a/utils/config.mlp +++ b/utils/config.mlp @@ -39,12 +39,12 @@ let binutils_nm = "%%BINUTILS_NM%%" let binutils_objcopy = "%%BINUTILS_OBJCOPY%%" let cc_profile = "%%CC_PROFILE%%" -let exec_magic_number = "Caml1999X007" -and cmi_magic_number = "Caml1999I009" -and cmo_magic_number = "Caml1999O005" -and cma_magic_number = "Caml1999A006" -and cmx_magic_number = "Caml1999Y008" -and cmxa_magic_number = "Caml1999Z009" +let exec_magic_number = "Caml1999X008" +and cmi_magic_number = "Caml1999I010" +and cmo_magic_number = "Caml1999O006" +and cma_magic_number = "Caml1999A007" +and cmx_magic_number = "Caml1999Y009" +and cmxa_magic_number = "Caml1999Z010" and ast_impl_magic_number = "Caml1999M010" and ast_intf_magic_number = "Caml1999N009" diff --git a/utils/misc.ml b/utils/misc.ml index e142ce2ad2..989c313bb2 100644 --- a/utils/misc.ml +++ b/utils/misc.ml @@ -154,10 +154,7 @@ let no_overflow_lsl a = min_int asr 1 <= a && a <= max_int asr 1 (* String operations *) let chop_extension_if_any fname = - try - ignore(String.index (Filename.basename fname) '.'); - Filename.chop_extension fname - with Not_found -> fname + try Filename.chop_extension fname with Invalid_argument _ -> fname let search_substring pat str start = let rec search i j = |