| From ae435bc27e1eb59e4ad571a37a144bf99dc68f55 Mon Sep 17 00:00:00 2001 |
| From: Romain Naour <romain.naour@gmail.com> |
| Date: Fri, 25 Dec 2015 11:40:53 +0100 |
| Subject: [PATCH] ld-makefile |
| |
| [Romain: rebase on top of 2.26] |
| Signed-off-by: Romain Naour <romain.naour@gmail.com> |
| --- |
| ld/Makefile.am | 2 +- |
| ld/Makefile.in | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/ld/Makefile.am b/ld/Makefile.am |
| index d86ad0940c9..c95b0ef0252 100644 |
| --- a/ld/Makefile.am |
| +++ b/ld/Makefile.am |
| @@ -57,7 +57,7 @@ endif |
| # We put the scripts in the directory $(scriptdir)/ldscripts. |
| # We can't put the scripts in $(datadir) because the SEARCH_DIR |
| # directives need to be different for native and cross linkers. |
| -scriptdir = $(tooldir)/lib |
| +scriptdir = $(libdir) |
| |
| EMUL = @EMUL@ |
| EMULATION_OFILES = @EMULATION_OFILES@ |
| diff --git a/ld/Makefile.in b/ld/Makefile.in |
| index 4792b2b013c..789df2d01b9 100644 |
| --- a/ld/Makefile.in |
| +++ b/ld/Makefile.in |
| @@ -563,7 +563,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) |
| # We put the scripts in the directory $(scriptdir)/ldscripts. |
| # We can't put the scripts in $(datadir) because the SEARCH_DIR |
| # directives need to be different for native and cross linkers. |
| -scriptdir = $(tooldir)/lib |
| +scriptdir = $(libdir) |
| BASEDIR = $(srcdir)/.. |
| BFDDIR = $(BASEDIR)/bfd |
| INCDIR = $(BASEDIR)/include |
| -- |
| 2.14.4 |
| |
