patches/binutils/2.21.1a/300-001_ld_makefile_patch.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Tue Mar 11 22:11:43 2014 +0100 (2014-03-11)
changeset 3293 e11a8a2e225d
permissions -rw-r--r--
comptools: do not force build of make-3.81 unless really needed

On systems with make-3.82, we forcibly force the build and the use
of make-3.81

But some newer tools break when building with make-3.81. For example,
eglibc-3.18 breaks.

Introduce a new blind options that tools may select if they require
make-3.81. If the system does not have make-3.81, and this option is
selected, then we force the build of make-3.81. Otherwise, we leave
it to the user to decide on his own.

Note that no component selects this option for now. It will come in
later patches as we find them.

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