blob: c31a0bc9a66a9df682ad799aacccf64b6851e9b7 [file] [log] [blame]
Andrew Geissler635e0e42020-08-21 15:58:33 -05001From 39b478b7e52fb1b892a392f3c3750b9023cfabc8 Mon Sep 17 00:00:00 2001
Andrew Geissler82c905d2020-04-13 13:39:40 -05002From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:09:58 +0000
Andrew Geissler635e0e42020-08-21 15:58:33 -05004Subject: [PATCH 05/17] Point scripts location to libdir
Andrew Geissler82c905d2020-04-13 13:39:40 -05005
6Upstream-Status: Inappropriate [debian patch]
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 ld/Makefile.am | 2 +-
11 ld/Makefile.in | 2 +-
12 2 files changed, 2 insertions(+), 2 deletions(-)
13
14diff --git a/ld/Makefile.am b/ld/Makefile.am
Andrew Geissler635e0e42020-08-21 15:58:33 -050015index a5762227f0a..e1c665898f3 100644
Andrew Geissler82c905d2020-04-13 13:39:40 -050016--- a/ld/Makefile.am
17+++ b/ld/Makefile.am
Andrew Geissler635e0e42020-08-21 15:58:33 -050018@@ -51,7 +51,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)
Andrew Geissler82c905d2020-04-13 13:39:40 -050019 # We put the scripts in the directory $(scriptdir)/ldscripts.
20 # We can't put the scripts in $(datadir) because the SEARCH_DIR
21 # directives need to be different for native and cross linkers.
22-scriptdir = $(tooldir)/lib
23+scriptdir = $(libdir)
24
25 EMUL = @EMUL@
26 EMULATION_OFILES = @EMULATION_OFILES@
27diff --git a/ld/Makefile.in b/ld/Makefile.in
Andrew Geissler635e0e42020-08-21 15:58:33 -050028index 8f0c83ac8d2..acc24ec4130 100644
Andrew Geissler82c905d2020-04-13 13:39:40 -050029--- a/ld/Makefile.in
30+++ b/ld/Makefile.in
Andrew Geissler635e0e42020-08-21 15:58:33 -050031@@ -556,7 +556,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)
Andrew Geissler82c905d2020-04-13 13:39:40 -050032 # We put the scripts in the directory $(scriptdir)/ldscripts.
33 # We can't put the scripts in $(datadir) because the SEARCH_DIR
34 # directives need to be different for native and cross linkers.
35-scriptdir = $(tooldir)/lib
36+scriptdir = $(libdir)
37 BASEDIR = $(srcdir)/..
38 BFDDIR = $(BASEDIR)/bfd
39 INCDIR = $(BASEDIR)/include
Andrew Geissler635e0e42020-08-21 15:58:33 -050040--
412.28.0
42