diff options
| author | Tom Kelly <ctk21@cl.cam.ac.uk> | 2021-10-01 13:53:46 +0100 |
|---|---|---|
| committer | Tom Kelly <ctk21@cl.cam.ac.uk> | 2021-10-01 13:53:46 +0100 |
| commit | dbd5c8a0bef908260365da4ac1789c047290239e (patch) | |
| tree | 2d8e9f60c3e88a81f53ea0a045de25baddce810f /ocamltest | |
| parent | d85f4d8efd39ca4094930c179d233dbf85f44451 (diff) | |
| parent | 5e45b2e9fa613099a334f19c95814f89ca16db7f (diff) | |
| download | ocaml-dbd5c8a0bef908260365da4ac1789c047290239e.tar.gz | |
Merge commit '5e45b2e9fa613099a334f19c95814f89ca16db7f' into parallel_minor_gc_4_13
Diffstat (limited to 'ocamltest')
| -rw-r--r-- | ocamltest/ocaml_actions.ml | 3 | ||||
| -rw-r--r-- | ocamltest/ocamltest_stdlib.ml | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ocamltest/ocaml_actions.ml b/ocamltest/ocaml_actions.ml index 9ff809fe5c..90b11ff29d 100644 --- a/ocamltest/ocaml_actions.ml +++ b/ocamltest/ocaml_actions.ml @@ -1107,7 +1107,8 @@ let config_variables _log env = Ocaml_variables.nativecc_libs, Ocamltest_config.nativecc_libs; Ocaml_variables.mkdll, Sys.getenv_with_default_value "MKDLL" Ocamltest_config.mkdll; - Ocaml_variables.mkexe, Ocamltest_config.mkexe; + Ocaml_variables.mkexe, + Sys.getenv_with_default_value "MKEXE" Ocamltest_config.mkexe; Ocaml_variables.c_preprocessor, Ocamltest_config.c_preprocessor; Ocaml_variables.cc, Ocamltest_config.cc; Ocaml_variables.csc, Ocamltest_config.csc; diff --git a/ocamltest/ocamltest_stdlib.ml b/ocamltest/ocamltest_stdlib.ml index ff9198e31d..23e03073f3 100644 --- a/ocamltest/ocamltest_stdlib.ml +++ b/ocamltest/ocamltest_stdlib.ml @@ -183,7 +183,7 @@ module Sys = struct let copy_chan ic oc = let m = in_channel_length ic in let m = (m lsr 12) lsl 12 in - let m = max 16384 (min Sys.max_string_length m) in + let m = Int.max 16384 (Int.min Sys.max_string_length m) in let buf = Bytes.create m in let rec loop () = let len = input ic buf 0 m in |