diff options
| author | Florian Angeletti <florian.angeletti@inria.fr> | 2021-09-09 10:42:07 +0200 |
|---|---|---|
| committer | Florian Angeletti <florian.angeletti@inria.fr> | 2021-09-09 10:53:49 +0200 |
| commit | 1e33a7e52be5481ec59ce66ee568e85a6bfb7072 (patch) | |
| tree | 64c89bbda4f4e8cdd4dc99faeab731f2879949df | |
| parent | f66f0d20f8a0312d4060a76d8522cde367693560 (diff) | |
| download | ocaml-1e33a7e52be5481ec59ce66ee568e85a6bfb7072.tar.gz | |
Merge pull request #10619 from shindere/fix-o-regression
Fix regression introduced by #9960
(cherry picked from commit cffde3184df1866b17213d7735410068d77854ed)
| -rw-r--r-- | Changes | 7 | ||||
| -rw-r--r-- | driver/compenv.ml | 2 |
2 files changed, 5 insertions, 4 deletions
@@ -315,9 +315,10 @@ OCaml 4.13.0 - #9407: added warning for missing mli interface file (Anukriti Kumar, review by Florian Angeletti) -- #9960: extend ocamlc/ocamlopt's -o option to work when compiling C files - (Sébastien Hinderer, reported by Daniel Bünzli, review by Florian - Angeletti and Gabriel Scherer) +- #9960, #10619: extend ocamlc/ocamlopt's -o option to work when + compiling C files + (Sébastien Hinderer, reported by Daniel Bünzli, review by + Florian Angeletti and Gabriel Scherer) - #10095: simplify the syntax error messages produced by the compiler. In many cases, the compiler would produce an error message that looked diff --git a/driver/compenv.ml b/driver/compenv.ml index f1e167d520..6d40f09e5d 100644 --- a/driver/compenv.ml +++ b/driver/compenv.ml @@ -645,7 +645,7 @@ let process_action | None -> c_object_of_filename name | Some n -> n in - if Ccomp.compile_file ~output:obj_name name <> 0 + if Ccomp.compile_file ?output:!output_name name <> 0 then raise (Exit_with_status 2); ccobjs := obj_name :: !ccobjs | ProcessObjects names -> |