42 lines
1.3 KiB
Diff
42 lines
1.3 KiB
Diff
|
From bf6f72c4e3c57864417ac1f917404cc83af8ec14 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 6243c12528..3c5d6c8202 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 760c037f9d..6dea692869 100644
|
||
|
|
--- a/ld/Makefile.in
|
||
|
|
+++ b/ld/Makefile.in
|
||
|
|
@@ -446,7 +446,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.3
|
||
|
|
|