diff options
Diffstat (limited to 'meta/recipes-devtools/binutils/binutils/rpath-sysroot.patch')
-rw-r--r-- | meta/recipes-devtools/binutils/binutils/rpath-sysroot.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/meta/recipes-devtools/binutils/binutils/rpath-sysroot.patch b/meta/recipes-devtools/binutils/binutils/rpath-sysroot.patch deleted file mode 100644 index 955699ed7b..0000000000 --- a/meta/recipes-devtools/binutils/binutils/rpath-sysroot.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | ld: -rpath must search under sysroot | ||
2 | |||
3 | The -rpath argument would search the host filesystem for libraries, | ||
4 | even when a sysroot was defined. For cross toolchains with targets | ||
5 | compatible with the host architecture this can find incorrect | ||
6 | libraries. Leave -rpath-link unmodified, as build systems in the wild | ||
7 | are already using this to point to host directories. | ||
8 | |||
9 | Signed-off-by: Andy Ross <andy.ross@windriver.com> | ||
10 | Upstream-Status: submitted (binutils@sourceware.org 2012-08-22) | ||
11 | --- | ||
12 | ld/emultempl/elf32.em | 10 +++++++--- | ||
13 | 1 file changed, 7 insertions(+), 3 deletions(-) | ||
14 | |||
15 | diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em | ||
16 | index de51050..35e0e7e 100644 | ||
17 | --- a/ld/emultempl/elf32.em | ||
18 | +++ b/ld/emultempl/elf32.em | ||
19 | @@ -1263,9 +1263,13 @@ fragment <<EOF | ||
20 | EOF | ||
21 | if [ "x${USE_LIBPATH}" = xyes ] ; then | ||
22 | fragment <<EOF | ||
23 | - if (gld${EMULATION_NAME}_search_needed (command_line.rpath, | ||
24 | - &n, force)) | ||
25 | - break; | ||
26 | + if (command_line.rpath) { | ||
27 | + char *tmprp = gld${EMULATION_NAME}_add_sysroot (command_line.rpath); | ||
28 | + found = gld${EMULATION_NAME}_search_needed (tmprp, &n, force); | ||
29 | + free(tmprp); | ||
30 | + if (found) | ||
31 | + break; | ||
32 | + } | ||
33 | EOF | ||
34 | fi | ||
35 | if [ "x${NATIVE}" = xyes ] ; then | ||
36 | -- | ||
37 | 1.7.11.2 | ||
38 | |||