diff options
| author | Alan Modra <amodra@bigpond.net.au> | 2010-10-28 12:06:27 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@bigpond.net.au> | 2010-10-28 12:06:27 +0000 |
| commit | 80ae14c557fede88194e985b421663d398e0b170 (patch) | |
| tree | 159879d85aae2e68009827f47410a133469fdb29 | |
| parent | 45676ca62ff62bdc9a922d139e2f87128bf60fa3 (diff) | |
| download | binutils-redhat-80ae14c557fede88194e985b421663d398e0b170.tar.gz | |
* ldfile.c (find_scripts_dir): Don't look in absolute SCRIPTDIR.
| -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 0ee2ed7fc9..8ea6f6d92d 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 2695905a3c..1732885fcc 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) |