Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix regression introduced by #9960 #10619

Merged
merged 1 commit into from
Sep 9, 2021
Merged

Fix regression introduced by #9960 #10619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions Changes
View file
Open in desktop
Expand Up @@ -486,9 +486,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
Expand Down
2 changes: 1 addition & 1 deletion driver/compenv.ml
View file
Open in desktop
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An alternative implementation would be to keep the definition of obj_name and replace the line above with

Ccomp.compile_file ?output:!output_name

if Ccomp.compile_file ?output:!output_name name <> 0
then raise (Exit_with_status 2);
ccobjs := obj_name :: !ccobjs
| ProcessObjects names ->
Expand Down