patches/binutils/2.22/300-001_ld_makefile_patch.patch
author Daniel Price <daniel.price@gmail.com>
Tue Nov 20 16:59:17 2012 -0800 (2012-11-20)
changeset 3126 333d3e40cbd1
permissions -rw-r--r--
scripts: refine static linking check to better guide the user

The current mechanism to check if static linking is possible, and the mesage
displayed on failure, can be puzzling to the unsuspecting user.

Also, the current implementation is not using the existing infrastructure,
and is thus difficult to enhance with new tests.

So, switch to using the standard CT_DoExecLog infra, and use four tests to
check for the host compiler:
- check we can run it
- check it can build a trivial program
- check it can statically link that program
- check if it statically link with libstdc++

That should cover most of the problems. Hopefully.

(At the same time, fix a typo in a comment)

Signed-off-by: Daniel Price <daniel.price@gmail.com>
[yann.morin.1998@free.fr: split original patch for self-contained changes]
[yann.morin.1998@free.fr: use steps to better see gcc's output]
[yann.morin.1998@free.fr: commit log]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Message-Id: <163f86b5216fc08c672a.1353459722@nipigon.dssd.com>
Patchwork-Id: 200536
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