patches/binutils/2.17/130-ld_makefile_patch.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Wed Sep 07 01:22:37 2011 +0200 (2011-09-07)
changeset 2653 e5fc5c9ea78a
parent 745 e445c00d134d
permissions -rw-r--r--
scripts: fix sysroot prefix dir

The sysroot prefix dir was broken in #4960f5d9f829 due to a mishap
when making the out-of-sysroot lib/ symlink: the './' was mistakenly
changed into a single '.' .

Although Jonathan suggested restoring the missing '/' to restore it to
normal operation, I prefered using an explicit pushd/popd to be extra
sure of the symlink location and target, along with a fix in the sysroot
relative directory calculation.

Reported-by: Jonathan Grundon <JGrundon@xos.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
yann@55
     1
diff -dur binutils-2.17.old/ld/Makefile.am binutils-2.17/ld/Makefile.am
yann@55
     2
--- binutils-2.17.old/ld/Makefile.am	2006-06-03 06:45:50.000000000 +0200
yann@55
     3
+++ binutils-2.17/ld/Makefile.am	2007-05-01 18:26:09.000000000 +0200
yann@55
     4
@@ -20,7 +20,7 @@
yann@55
     5
 # We put the scripts in the directory $(scriptdir)/ldscripts.
yann@55
     6
 # We can't put the scripts in $(datadir) because the SEARCH_DIR
yann@55
     7
 # directives need to be different for native and cross linkers.
yann@55
     8
-scriptdir = $(tooldir)/lib
yann@55
     9
+scriptdir = $(libdir)
yann@55
    10
 
yann@55
    11
 EMUL = @EMUL@
yann@55
    12
 EMULATION_OFILES = @EMULATION_OFILES@
yann@55
    13
diff -dur binutils-2.17.old/ld/Makefile.in binutils-2.17/ld/Makefile.in
yann@55
    14
--- binutils-2.17.old/ld/Makefile.in	2006-06-03 06:45:50.000000000 +0200
yann@55
    15
+++ binutils-2.17/ld/Makefile.in	2007-05-01 18:26:09.000000000 +0200
yann@55
    16
@@ -269,7 +269,7 @@
yann@55
    17
 # We put the scripts in the directory $(scriptdir)/ldscripts.
yann@55
    18
 # We can't put the scripts in $(datadir) because the SEARCH_DIR
yann@55
    19
 # directives need to be different for native and cross linkers.
yann@55
    20
-scriptdir = $(tooldir)/lib
yann@55
    21
+scriptdir = $(libdir)
yann@55
    22
 BASEDIR = $(srcdir)/..
yann@55
    23
 BFDDIR = $(BASEDIR)/bfd
yann@55
    24
 INCDIR = $(BASEDIR)/include