blob: 90abd50498581316d30d19904dda3889dcdcf484 [file] [log] [blame]
Andrew Geisslerc5535c92023-01-27 16:10:19 -06001From a7c988d60f11c8279453c2d9edeede001cce7c9e Mon Sep 17 00:00:00 2001
Andrew Geissler7e0e3c02022-02-25 20:34:39 +00002From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:09:58 +0000
4Subject: [PATCH] Point scripts location to libdir
5
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 Geisslerc5535c92023-01-27 16:10:19 -060015index 0590b7055d0..c30db94ee3c 100644
Andrew Geissler7e0e3c02022-02-25 20:34:39 +000016--- a/ld/Makefile.am
17+++ b/ld/Makefile.am
Andrew Geisslerc5535c92023-01-27 16:10:19 -060018@@ -51,7 +51,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS) $(ZSTD_CFLAGS)
Andrew Geissler7e0e3c02022-02-25 20:34:39 +000019 # 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 Geisslerc5535c92023-01-27 16:10:19 -060028index 70643b1ce46..0405028e02f 100644
Andrew Geissler7e0e3c02022-02-25 20:34:39 +000029--- a/ld/Makefile.in
30+++ b/ld/Makefile.in
Andrew Geisslerc5535c92023-01-27 16:10:19 -060031@@ -574,7 +574,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) $(JANSSON_CFLAGS) $(ZSTD_CFLAGS)
Andrew Geissler7e0e3c02022-02-25 20:34:39 +000032 # 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