* ldmain.c (set_scripts_dir): Look for relative to TOOLBINDIR as
well.
This commit is contained in:
parent
e3f2db7fa6
commit
4ca1b7908a
@ -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.
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user