Merge pull request #8981 from gretay-js/incompatible-o-c

Fix check for incompatible -c and -o options
master
Gabriel Scherer 2019-10-17 11:44:46 +02:00 committed by GitHub
commit e18564d839
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions

View File

@ -387,6 +387,9 @@ Working version
- #8896: deprecate addr typedef in misc.h
(David Allsopp, suggestion by Xavier Leroy)
- #8981: Fix check for incompatible -c and -o options.
(Greta Yorsh, review by Damien Doligez)
OCaml 4.09 maintenance branch:
------------------------------

View File

@ -661,7 +661,7 @@ let process_deferred_actions env =
if List.length (List.filter (function
| ProcessImplementation _
| ProcessInterface _
| ProcessInterface _ -> true
| _ -> false) !deferred_actions) > 1 then
fatal "Options -c -o are incompatible with compiling multiple files"
end;