2001-02-20 H.J. Lu <hjl@gnu.org>

* ldfile.c (ldfile_open_file): Set entry->search_dirs_flag to
	false if we found the file.
This commit is contained in:
H.J. Lu 2001-02-20 21:07:24 +00:00
parent 60cf7a8541
commit 78f85fd798
2 changed files with 21 additions and 7 deletions

View file

@ -1,3 +1,8 @@
2001-02-20 H.J. Lu <hjl@gnu.org>
* ldfile.c (ldfile_open_file): Set entry->search_dirs_flag to
false if we found the file.
001-02-18 David O'Brien <obrien@FreeBSD.org> 001-02-18 David O'Brien <obrien@FreeBSD.org>
* configure.tgt: Add FreeBSD/Alpha, FreeBSD/x86-64, FreeBSD/ia64, * configure.tgt: Add FreeBSD/Alpha, FreeBSD/x86-64, FreeBSD/ia64,

View file

@ -231,23 +231,32 @@ ldfile_open_file (entry)
else else
{ {
search_arch_type *arch; search_arch_type *arch;
boolean found = false;
/* Try to open <filename><suffix> or lib<filename><suffix>.a */ /* Try to open <filename><suffix> or lib<filename><suffix>.a */
for (arch = search_arch_head; for (arch = search_arch_head;
arch != (search_arch_type *) NULL; arch != (search_arch_type *) NULL;
arch = arch->next) arch = arch->next)
{ {
if (ldfile_open_file_search (arch->name, entry, "lib", ".a")) found = ldfile_open_file_search (arch->name, entry, "lib", ".a");
return; if (found)
break;
#ifdef VMS #ifdef VMS
if (ldfile_open_file_search (arch->name, entry, ":lib", ".a")) found = ldfile_open_file_search (arch->name, entry, ":lib", ".a");
return; if (found)
break;
#endif #endif
if (ldemul_find_potential_libraries (arch->name, entry)) found = ldemul_find_potential_libraries (arch->name, entry);
return; if (found)
break;
} }
einfo (_("%F%P: cannot find %s\n"), entry->local_sym_name); /* If we have found the file, we don't need to search directories
again. */
if (found)
entry->search_dirs_flag = false;
else
einfo (_("%F%P: cannot find %s\n"), entry->local_sym_name);
} }
} }