diff options
| author | Alan Modra <amodra@bigpond.net.au> | 2008-08-09 10:15:39 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@bigpond.net.au> | 2008-08-09 10:15:39 +0000 |
| commit | e6b5c9846ca9e1e6be5c1d4ce9075c9bc0cd911e (patch) | |
| tree | 49e92408563518a45417ac22d4b2b22700d4a0f8 /ld/Makefile.am | |
| parent | 0d05cc2205adb5b15078b373267c88fecf643749 (diff) | |
| download | binutils-redhat-e6b5c9846ca9e1e6be5c1d4ce9075c9bc0cd911e.tar.gz | |
PR 6753
* ldmain.c (check_for_scripts_dir, set_scripts_dir): Delete.
(main): Don't set_scripts_dir here.
* ldfile.c (check_for_scripts_dir, find_scripts_dir): New functions,
largely based on ldmain.c versions.
(ldfile_find_command_file): Set up search in script dir here without
affecting library search.
* Makefile.am (ldmain.o): No need to define SCRIPTDIR.
(ldfile.o): New rule.
* Makefile.in: Regenerate.
Diffstat (limited to 'ld/Makefile.am')
| -rw-r--r-- | ld/Makefile.am | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ld/Makefile.am b/ld/Makefile.am index 98000adb58..1584a245ee 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -468,11 +468,15 @@ po/POTFILES.in: @MAINT@ Makefile ldmain.o: ldmain.c config.status $(COMPILE) -c -DDEFAULT_EMULATION='"$(EMUL)"' \ - -DSCRIPTDIR='"$(scriptdir)"' -DBINDIR='"$(bindir)"' \ - -DTOOLBINDIR='"$(tooldir)/bin"' \ + -DBINDIR='"$(bindir)"' -DTOOLBINDIR='"$(tooldir)/bin"' \ -DTARGET='"@target@"' @TARGET_SYSTEM_ROOT_DEFINE@ \ $(srcdir)/ldmain.c +ldfile.o: ldfile.c config.status + $(COMPILE) -c -DSCRIPTDIR='"$(scriptdir)"' \ + -DBINDIR='"$(bindir)"' -DTOOLBINDIR='"$(tooldir)/bin"' \ + $(srcdir)/ldfile.c + eelf32_spu.o: eelf32_spu.c $(COMPILE) -c -DEMBEDSPU="\"`echo embedspu | sed '$(transform)'`\"" \ eelf32_spu.c |