blob: 5a35abc0360c63e73edd8ee8d4dcecfcceecb127 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
|
Author: Chris Chimelis <chris@debian.org>
Description: Only generate an RPATH entry if LD_RUN_PATH is not empty, for
cases where -rpath isn't specified. (#151024)
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -1266,6 +1266,8 @@
&& command_line.rpath == NULL)
{
lib_path = (const char *) getenv ("LD_RUN_PATH");
+ if ((lib_path) && (strlen (lib_path) == 0))
+ lib_path = NULL;
if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
force))
break;
@@ -1493,6 +1495,8 @@
rpath = command_line.rpath;
if (rpath == NULL)
rpath = (const char *) getenv ("LD_RUN_PATH");
+ if ((rpath) && (strlen (rpath) == 0))
+ rpath = NULL;
for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next)
if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
|
