Index: libcpp/ChangeLog
2005-01-03 Geoffrey Keating <geoffk@apple.com> * files.c (_cpp_find_file): Add files found by search_path_exhausted to the list of all files. Index: gcc/testsuite/ChangeLog 2005-01-03 Geoffrey Keating <geoffk@apple.com> Robert Bowdidge <bowdidge@apple.com> * gcc.dg/cpp/subframework1.c: New. * gcc.dg/cpp/frame/one.framework/Frameworks/OneSub.framework/Headers/A.h: New. * gcc.dg/cpp/frame/one.framework/Frameworks/OneSub.framework/Headers/B.h: New. * gcc.dg/cpp/frame/one.framework/Frameworks/OneSub.framework/Headers/C.h: New. * gcc.dg/cpp/frame/one.framework/Headers/one-includeSubs.h: New. Co-Authored-By: Robert Bowdidge <bowdidge@apple.com> From-SVN: r92883
This commit is contained in:
parent
1eb3331e96
commit
942926ad9a
8 changed files with 46 additions and 1 deletions
|
@ -438,7 +438,15 @@ _cpp_find_file (cpp_reader *pfile, const char *fname, cpp_dir *start_dir, bool f
|
|||
if (file->dir == NULL)
|
||||
{
|
||||
if (search_path_exhausted (pfile, fname, file))
|
||||
return file;
|
||||
{
|
||||
/* Although this file must not go in the cache, because
|
||||
the file found might depend on things (like the current file)
|
||||
that aren't represented in the cache, it still has to go in
|
||||
the list of all files so that #import works. */
|
||||
file->next_file = pfile->all_files;
|
||||
pfile->all_files = file;
|
||||
return file;
|
||||
}
|
||||
|
||||
open_file_failed (pfile, file);
|
||||
if (invalid_pch)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue