patches/binutils/2.22/300-001_ld_makefile_patch.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Wed Dec 05 20:31:43 2012 +0100 (2012-12-05)
changeset 3134 863723936e24
permissions -rw-r--r--
scripts/xldd: use user's sed and grep

xldd uses sed and grep as detected by ./configure. This works well if is
used on the machine that build the toolchain.

But if the user moves the toolchain to another machine where sed and grep
are not in the same directory (eg. /bin/sed vs. /usr/bin/sed), then xldd
will stop functionning.

Fix that by using ${SED} and ${GREP} if they are set in the environment.

Reported-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
benoit@2810
     1
diff -durN binutils-2.22.orig/ld/Makefile.am binutils-2.22/ld/Makefile.am
benoit@2810
     2
--- binutils-2.22.orig/ld/Makefile.am	2011-07-22 22:22:37.000000000 +0200
benoit@2810
     3
+++ binutils-2.22/ld/Makefile.am	2011-12-14 19:50:25.760779164 +0100
benoit@2810
     4
@@ -37,7 +37,7 @@
benoit@2810
     5
 # We put the scripts in the directory $(scriptdir)/ldscripts.
benoit@2810
     6
 # We can't put the scripts in $(datadir) because the SEARCH_DIR
benoit@2810
     7
 # directives need to be different for native and cross linkers.
benoit@2810
     8
-scriptdir = $(tooldir)/lib
benoit@2810
     9
+scriptdir = $(libdir)
benoit@2810
    10
 
benoit@2810
    11
 EMUL = @EMUL@
benoit@2810
    12
 EMULATION_OFILES = @EMULATION_OFILES@
benoit@2810
    13
diff -durN binutils-2.22.orig/ld/Makefile.in binutils-2.22/ld/Makefile.in
benoit@2810
    14
--- binutils-2.22.orig/ld/Makefile.in	2011-07-22 22:22:37.000000000 +0200
benoit@2810
    15
+++ binutils-2.22/ld/Makefile.in	2011-12-14 19:50:25.784779163 +0100
benoit@2810
    16
@@ -366,7 +366,7 @@
benoit@2810
    17
 # We put the scripts in the directory $(scriptdir)/ldscripts.
benoit@2810
    18
 # We can't put the scripts in $(datadir) because the SEARCH_DIR
benoit@2810
    19
 # directives need to be different for native and cross linkers.
benoit@2810
    20
-scriptdir = $(tooldir)/lib
benoit@2810
    21
+scriptdir = $(libdir)
benoit@2810
    22
 BASEDIR = $(srcdir)/..
benoit@2810
    23
 BFDDIR = $(BASEDIR)/bfd
benoit@2810
    24
 INCDIR = $(BASEDIR)/include