diff options
| author | Alexandre Oliva <aoliva@redhat.com> | 2003-03-03 20:01:02 +0000 |
|---|---|---|
| committer | Alexandre Oliva <aoliva@redhat.com> | 2003-03-03 20:01:02 +0000 |
| commit | 4ca1b7908a1eea493aa1af9cba59b39a500ccabd (patch) | |
| tree | 7bc2dd2aedab95e424a3e8a9a9589c9f8b0dce0a /ld | |
| parent | e3f2db7fa69d2c1f4c7dbee442da6b262c706700 (diff) | |
| download | gdb-4ca1b7908a1eea493aa1af9cba59b39a500ccabd.zip gdb-4ca1b7908a1eea493aa1af9cba59b39a500ccabd.tar.gz gdb-4ca1b7908a1eea493aa1af9cba59b39a500ccabd.tar.bz2 | |
* ldmain.c (set_scripts_dir): Look for relative to TOOLBINDIR as
well.
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 3 | ||||
| -rw-r--r-- | ld/ldmain.c | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index fbb39f1..aa8070e 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -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. diff --git a/ld/ldmain.c b/ld/ldmain.c index e9f26e2..214847d 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c @@ -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; |