* ldmain.c (set_scripts_dir): Look for relative to TOOLBINDIR as

well.
This commit is contained in:
Alexandre Oliva 2003-03-03 20:01:02 +00:00
parent e3f2db7fa6
commit 4ca1b7908a
2 changed files with 11 additions and 0 deletions

View File

@ -1,5 +1,8 @@
2003-03-03 Alexandre Oliva <aoliva@redhat.com>
* ldmain.c (set_scripts_dir): Look for relative to TOOLBINDIR as
well.
* ldfile.h (struct search_dirs): Added sysrooted field.
* ldlang.h (struct lang_input_statement_struct): Likewise.
* ldfile.c (ldfile_add_library_path): Mark sysrooted paths.

View File

@ -669,6 +669,14 @@ set_scripts_dir ()
if (dir)
free (dir);
dir = make_relative_prefix (program_name, TOOLBINDIR, SCRIPTDIR);
if (dir && check_for_scripts_dir (dir))
/* Success. Don't free dir. */
return;
if (dir)
free (dir);
if (check_for_scripts_dir (SCRIPTDIR))
/* We've been installed normally. */
return;