From 80ae14c557fede88194e985b421663d398e0b170 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 28 Oct 2010 12:06:27 +0000 Subject: [PATCH] * ldfile.c (find_scripts_dir): Don't look in absolute SCRIPTDIR. --- ld/ChangeLog | 4 ++++ ld/ldfile.c | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 0ee2ed7fc..8ea6f6d92 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +2010-10-28 Alan Modra + + * ldfile.c (find_scripts_dir): Don't look in absolute SCRIPTDIR. + 2010-10-28 Matthias Klose * ld.texinfo: Add directory section for info document. diff --git a/ld/ldfile.c b/ld/ldfile.c index 2695905a3..1732885fc 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) -- 2.11.4.GIT