patches/binutils/2.20.1a/240-ld_makefile.patch
author Trevor Woerner <trevor.woerner@linaro.org>
Tue Feb 25 13:34:48 2014 -0500 (2014-02-25)
changeset 3302 ea7e988e6244
parent 2088 4f21ba5f8e91
permissions -rw-r--r--
newlib: fix extract process for custom version

newlib: fix extract process for custom version

If the user specifies the use of a custom newlib version, the logic in the
extract function was reversed, so this step would fail.

Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org>
[yann.morin.1998@free.fr: keep leading indentation]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Message-Id: <c727adf1b7bd2c1e891d.1393353347@openSUSE-i7>
Patchwork-Id: 324060
jocke@1700
     1
Description: correct where ld scripts are installed
jocke@1700
     2
Author: Chris Chimelis <chris@debian.org>
jocke@1700
     3
yann@2088
     4
diff -durN binutils-2.20.1.orig/ld/Makefile.am binutils-2.20.1/ld/Makefile.am
yann@2088
     5
--- binutils-2.20.1.orig/ld/Makefile.am	2010-02-22 09:07:01.000000000 +0100
yann@2088
     6
+++ binutils-2.20.1/ld/Makefile.am	2010-08-17 19:32:21.000000000 +0200
yann@2088
     7
@@ -24,7 +24,7 @@
jocke@1700
     8
 # We put the scripts in the directory $(scriptdir)/ldscripts.
jocke@1700
     9
 # We can't put the scripts in $(datadir) because the SEARCH_DIR
jocke@1700
    10
 # directives need to be different for native and cross linkers.
jocke@1700
    11
-scriptdir = $(tooldir)/lib
jocke@1700
    12
+scriptdir = $(libdir)
jocke@1700
    13
 
jocke@1700
    14
 EMUL = @EMUL@
jocke@1700
    15
 EMULATION_OFILES = @EMULATION_OFILES@
yann@2088
    16
diff -durN binutils-2.20.1.orig/ld/Makefile.in binutils-2.20.1/ld/Makefile.in
yann@2088
    17
--- binutils-2.20.1.orig/ld/Makefile.in	2010-03-03 15:06:21.000000000 +0100
yann@2088
    18
+++ binutils-2.20.1/ld/Makefile.in	2010-08-17 19:32:21.000000000 +0200
yann@2088
    19
@@ -333,7 +333,7 @@
jocke@1700
    20
 # We put the scripts in the directory $(scriptdir)/ldscripts.
jocke@1700
    21
 # We can't put the scripts in $(datadir) because the SEARCH_DIR
jocke@1700
    22
 # directives need to be different for native and cross linkers.
jocke@1700
    23
-scriptdir = $(tooldir)/lib
jocke@1700
    24
+scriptdir = $(libdir)
jocke@1700
    25
 BASEDIR = $(srcdir)/..
jocke@1700
    26
 BFDDIR = $(BASEDIR)/bfd
jocke@1700
    27
 INCDIR = $(BASEDIR)/include