FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Makefile.am (ldmain.o): Pass BINDIR.

Browse source 
* Makefile.in: Regenerated.
	* ldmain.c (set_scripts_dir): Use make_relative_prefix for the first
	search path.
This commit is contained in:
Daniel Jacobowitz 2003-01-04 20:40:28 +00:00
parent bfd260bb5c
commit cdc0d45e15
4 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ld/ChangeLog
View file

@ -1,3 +1,10 @@
2003-01-04 Daniel Jacobowitz <drow@mvista.com>
* Makefile.am (ldmain.o): Pass BINDIR.
* Makefile.in: Regenerated.
* ldmain.c (set_scripts_dir): Use make_relative_prefix for the first
search path.
2003-01-02 Ben Elliston <bje@redhat.com> 2003-01-02 Ben Elliston <bje@redhat.com>
* Makefile.am (ALL_EMULATIONS): Add eelf32iq2000.o. * Makefile.am (ALL_EMULATIONS): Add eelf32iq2000.o.

2
ld/Makefile.am
View file

@ -393,7 +393,7 @@ po/POTFILES.in: @MAINT@ Makefile
&& mv tmp $(srcdir)/po/POTFILES.in && mv tmp $(srcdir)/po/POTFILES.in
ldmain.o: ldmain.c config.status ldmain.o: ldmain.c config.status
$(COMPILE) -c -DDEFAULT_EMULATION='"$(EMUL)"' -DSCRIPTDIR='"$(scriptdir)"' -DTARGET='"@target@"' $(srcdir)/ldmain.c $(COMPILE) -c -DDEFAULT_EMULATION='"$(EMUL)"' -DSCRIPTDIR='"$(scriptdir)"' -DBINDIR='"$(bindir)"' -DTARGET='"@target@"' $(srcdir)/ldmain.c
ldemul-list.h: Makefile ldemul-list.h: Makefile
(echo "/* This file is automatically generated. DO NOT EDIT! */";\ (echo "/* This file is automatically generated. DO NOT EDIT! */";\

2
ld/Makefile.in
View file

@ -1121,7 +1121,7 @@ po/POTFILES.in: @MAINT@ Makefile
&& mv tmp $(srcdir)/po/POTFILES.in && mv tmp $(srcdir)/po/POTFILES.in
ldmain.o: ldmain.c config.status ldmain.o: ldmain.c config.status
$(COMPILE) -c -DDEFAULT_EMULATION='"$(EMUL)"' -DSCRIPTDIR='"$(scriptdir)"' -DTARGET='"@target@"' $(srcdir)/ldmain.c $(COMPILE) -c -DDEFAULT_EMULATION='"$(EMUL)"' -DSCRIPTDIR='"$(scriptdir)"' -DBINDIR='"$(bindir)"' -DTARGET='"@target@"' $(srcdir)/ldmain.c
ldemul-list.h: Makefile ldemul-list.h: Makefile
(echo "/* This file is automatically generated. DO NOT EDIT! */";\ (echo "/* This file is automatically generated. DO NOT EDIT! */";\

15
ld/ldmain.c
View file

@ -1,6 +1,6 @@
/* Main program of GNU linker. /* Main program of GNU linker.
Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
2002 2002, 2003
Free Software Foundation, Inc. Free Software Foundation, Inc.
Written by Steve Chamberlain steve@cygnus.com Written by Steve Chamberlain steve@cygnus.com
@ -611,9 +611,12 @@ check_for_scripts_dir (dir)
Libraries will be searched for here too, but that's ok. Libraries will be searched for here too, but that's ok.
We look for the "ldscripts" directory in: We look for the "ldscripts" directory in:
SCRIPTDIR (passed from Makefile)
(adjusted according to the current location of the binary)
SCRIPTDIR (passed from Makefile) SCRIPTDIR (passed from Makefile)
the dir where this program is (for using it from the build tree) the dir where this program is (for using it from the build tree)
the dir where this program is/../lib (for installing the tool suite elsewhere) */ the dir where this program is/../lib
(for installing the tool suite elsewhere) */
static void static void
set_scripts_dir () set_scripts_dir ()
@ -621,6 +624,14 @@ set_scripts_dir ()
char *end, *dir; char *end, *dir;
size_t dirlen; size_t dirlen;
dir = make_relative_prefix (program_name, BINDIR, SCRIPTDIR);
if (dir && check_for_scripts_dir (dir))
/* Success. Don't free dir. */
return;
if (dir)
free (dir);
if (check_for_scripts_dir (SCRIPTDIR)) if (check_for_scripts_dir (SCRIPTDIR))
/* We've been installed normally. */ /* We've been installed normally. */
return; return;