ld: write resolved path to included file to dependency-file

In ldfile_open_command_file_1() name written to the dependency files is
the name as specified passed to the "INCLUDE" directive.
This is before include-path processing so the tracked dependency
location is most likely wrong.

Instead track the opened file at the point where the resolved path is
actually available, in try_open().

Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
This commit is contained in:
Thomas Weißschuh 2023-09-21 08:03:09 +02:00 committed by Jan Beulich
parent f21e7f44e4
commit 0ad14a8c34

View File

@ -743,7 +743,10 @@ try_open (const char *name, bool *sysrooted)
result = fopen (name, "r");
if (result != NULL)
*sysrooted = is_sysrooted_pathname (name);
{
*sysrooted = is_sysrooted_pathname (name);
track_dependency_files (name);
}
if (verbose)
{
@ -925,8 +928,6 @@ ldfile_open_command_file_1 (const char *name, enum script_open_style open_how)
return;
}
track_dependency_files (name);
lex_push_file (ldlex_input_stack, name, sysrooted);
lineno = 1;