patches/binutils/2.20/240-ld_makefile.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Jul 12 23:52:24 2011 +0200 (2011-07-12)
branch1.11
changeset 2558 b7317d2fe0e9
permissions -rw-r--r--
scripts, cc/gcc: do not fail on existing symlinks or build.log

If the user builds a toolchain over an existing one, so, without removing
CT_PREFIX_DIR, the build fails as the symlinks already exist, as does the
build.log.

This can also happen (for build.log) if the user first ran in download-
or extract-only.

Patch (with no SoB) originally from:
Phil Wilshire <phil.wilshire@overturenetworks.com>

Modified by me as it did not apply cleanly.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
(transplanted from 1ebc2248cc60230cd53ff94ae8f8f1e3261461a3)
jocke@1700
     1
Description: correct where ld scripts are installed
jocke@1700
     2
Author: Chris Chimelis <chris@debian.org>
jocke@1700
     3
jocke@1700
     4
--- binutils-2.16.91.0.1/ld/Makefile.am
jocke@1700
     5
+++ binutils-2.16.91.0.1/ld/Makefile.am
jocke@1700
     6
@@ -20,7 +20,7 @@
jocke@1700
     7
 # We put the scripts in the directory $(scriptdir)/ldscripts.
jocke@1700
     8
 # We can't put the scripts in $(datadir) because the SEARCH_DIR
jocke@1700
     9
 # directives need to be different for native and cross linkers.
jocke@1700
    10
-scriptdir = $(tooldir)/lib
jocke@1700
    11
+scriptdir = $(libdir)
jocke@1700
    12
 
jocke@1700
    13
 EMUL = @EMUL@
jocke@1700
    14
 EMULATION_OFILES = @EMULATION_OFILES@
jocke@1700
    15
--- binutils-2.16.91.0.1/ld/Makefile.in
jocke@1700
    16
+++ binutils-2.16.91.0.1/ld/Makefile.in
jocke@1700
    17
@@ -268,7 +268,7 @@
jocke@1700
    18
 # We put the scripts in the directory $(scriptdir)/ldscripts.
jocke@1700
    19
 # We can't put the scripts in $(datadir) because the SEARCH_DIR
jocke@1700
    20
 # directives need to be different for native and cross linkers.
jocke@1700
    21
-scriptdir = $(tooldir)/lib
jocke@1700
    22
+scriptdir = $(libdir)
jocke@1700
    23
 BASEDIR = $(srcdir)/..
jocke@1700
    24
 BFDDIR = $(BASEDIR)/bfd
jocke@1700
    25
 INCDIR = $(BASEDIR)/include