diff options
| author | Per Bothner <per@bothner.com> | 2003-11-02 23:24:28 -0800 |
|---|---|---|
| committer | Per Bothner <bothner@gcc.gnu.org> | 2003-11-02 23:24:28 -0800 |
| commit | d8ccee1ee42845b71e2e5b8b99d689512383797f (patch) | |
| tree | d8066b3d70eba76b7afa85a3aaf00eec2e0eab24 | |
| parent | ee208a59192c846d2f79be475864b885fd5ec596 (diff) | |
| download | gcc-d8ccee1ee42845b71e2e5b8b99d689512383797f.zip gcc-d8ccee1ee42845b71e2e5b8b99d689512383797f.tar.gz gcc-d8ccee1ee42845b71e2e5b8b99d689512383797f.tar.bz2 | |
c-opts.c (needValue): Do cpp_find_main_file before processing any imacros flags...
* c-opts.c (needValue): Do cpp_find_main_file before processing
any imacros flags, so pfile->main_file is set for the latter.
From-SVN: r73212
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/c-opts.c | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 09c59c1..928acd5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2003-11-02 Per Bothner <per@bothner.com> + + * c-opts.c (needValue): Do cpp_find_main_file before processing + any imacros flags, so pfile->main_file is set for the latter. + 2003-11-03 Andreas Jaeger <aj@suse.de> Zack Weinberg <zack@codesourcery.com> diff --git a/gcc/c-opts.c b/gcc/c-opts.c index 4473eaf..bbabe89 100644 --- a/gcc/c-opts.c +++ b/gcc/c-opts.c @@ -1392,6 +1392,10 @@ add_prefixed_path (const char *suffix, size_t chain) static bool finish_options (const char *tif) { + this_input_filename = tif; + if (! cpp_find_main_file (parse_in, this_input_filename)) + return false; + if (!cpp_opts->preprocessed) { size_t i; @@ -1441,9 +1445,6 @@ finish_options (const char *tif) } include_cursor = 0; - this_input_filename = tif; - if (! cpp_find_main_file (parse_in, this_input_filename)) - return false; push_command_line_include (); return true; } |