diff options
| author | Alan Modra <amodra@gmail.com> | 2010-10-28 12:06:27 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2010-10-28 12:06:27 +0000 |
| commit | ace9d8665fab93c30e94c3081b2a7f89843fb560 (patch) | |
| tree | 86b4c34ae5ab076cc42b929c8835473f1ed470be /ld | |
| parent | 9160ea826ada6f6763b2d71f10a5bb13170875f8 (diff) | |
| download | gdb-ace9d8665fab93c30e94c3081b2a7f89843fb560.zip gdb-ace9d8665fab93c30e94c3081b2a7f89843fb560.tar.gz gdb-ace9d8665fab93c30e94c3081b2a7f89843fb560.tar.bz2 | |
* ldfile.c (find_scripts_dir): Don't look in absolute SCRIPTDIR.
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 4 | ||||
| -rw-r--r-- | ld/ldfile.c | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 0ee2ed7..8ea6f6d 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +2010-10-28 Alan Modra <amodra@gmail.com> + + * ldfile.c (find_scripts_dir): Don't look in absolute SCRIPTDIR. + 2010-10-28 Matthias Klose <doko@ubuntu.com> * ld.texinfo: Add directory section for info document. diff --git a/ld/ldfile.c b/ld/ldfile.c index 2695905..1732885 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c @@ -547,7 +547,6 @@ check_for_scripts_dir (char *dir) SCRIPTDIR (passed from Makefile) (adjusted according to the current location of the binary) - SCRIPTDIR (passed from Makefile) the dir where this program is (for using it from the build tree). */ static char * @@ -571,10 +570,6 @@ find_scripts_dir (void) free (dir); } - if (check_for_scripts_dir (SCRIPTDIR)) - /* We've been installed normally. */ - return SCRIPTDIR; - /* Look for "ldscripts" in the dir where our binary is. */ dir = make_relative_prefix (program_name, ".", "."); if (dir) |