diff options
| author | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-08-24 08:20:19 +0200 |
|---|---|---|
| committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-08-24 08:20:19 +0200 |
| commit | 448477ec6be14c0217f7ff74d90fb53d78fdf5c9 (patch) | |
| tree | ea0a43781e377d5a48e94d6e33d2b88a5b0bd106 /driver | |
| parent | 25508b2953ff8d0941c257ee1cb887278cfebd79 (diff) | |
| download | compcert-448477ec6be14c0217f7ff74d90fb53d78fdf5c9.tar.gz compcert-448477ec6be14c0217f7ff74d90fb53d78fdf5c9.zip | |
Count number of input files and do not use number of source files for warning about no input.
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/Driver.ml | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/driver/Driver.ml b/driver/Driver.ml index e787b935..d628e283 100644 --- a/driver/Driver.ml +++ b/driver/Driver.ml @@ -514,6 +514,8 @@ let unset_all opts = List.iter (fun r -> r := false) opts let num_source_files = ref 0 +let num_input_files = ref 0 + let cmdline_actions = let f_opt name ref = [Exact("-f" ^ name), Set ref; Exact("-fno-" ^ name), Unset ref] in @@ -636,25 +638,25 @@ let cmdline_actions = eprintf "Unknown option `%s'\n" s; exit 2); (* File arguments *) Suffix ".c", Self (fun s -> - push_action process_c_file s; incr num_source_files); + push_action process_c_file s; incr num_source_files; incr num_input_files); Suffix ".i", Self (fun s -> - push_action process_i_file s; incr num_source_files); + push_action process_i_file s; incr num_source_files; incr num_input_files); Suffix ".p", Self (fun s -> - push_action process_i_file s; incr num_source_files); + push_action process_i_file s; incr num_source_files; incr num_input_files); Suffix ".cm", Self (fun s -> - push_action process_cminor_file s; incr num_source_files); + push_action process_cminor_file s; incr num_source_files; incr num_input_files); Suffix ".s", Self (fun s -> - push_action process_s_file s; incr num_source_files); + push_action process_s_file s; incr num_source_files; incr num_input_files); Suffix ".S", Self (fun s -> - push_action process_S_file s; incr num_source_files); - Suffix ".o", Self push_linker_arg; - Suffix ".a", Self push_linker_arg; + push_action process_S_file s; incr num_source_files; incr num_input_files); + Suffix ".o", Self (fun s -> push_linker_arg s; incr num_input_files); + Suffix ".a", Self (fun s -> push_linker_arg s; incr num_input_files); (* GCC compatibility: .o.ext files and .so files are also object files *) - _Regexp ".*\\.o\\.", Self push_linker_arg; - Suffix ".so", Self push_linker_arg; + _Regexp ".*\\.o\\.", Self (fun s -> push_linker_arg s; incr num_input_files); + Suffix ".so", Self (fun s -> push_linker_arg s; incr num_input_files); (* GCC compatibility: .h files can be preprocessed with -E *) Suffix ".h", Self (fun s -> - push_action process_h_file s; incr num_source_files); + push_action process_h_file s; incr num_source_files; incr num_input_files); ] let _ = @@ -683,7 +685,7 @@ let _ = eprintf "Ambiguous '-o' option (multiple source files)\n"; exit 2 end; - if !num_source_files = 0 then + if !num_input_files = 0 then begin eprintf "ccomp: error: no input file\n"; exit 2 |