Only generate an RPATH entry if LD_RUN_PATH is not empty, for

cases where -rpath isn't specified. (#151024)

Gbp-Pq: Name 012_check_ldrunpath_length.patch

diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index 1ad9d6b6fa815ebaa93fb151fc6ae3e1bf8c58c7..d9b3d26b49f9f397377078e51e99c233a1fb521b 100644 (file)
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -1471,6 +1471,8 @@ fragment <<EOF
              && command_line.rpath == NULL)
            {
              path = (const char *) getenv ("LD_RUN_PATH");
+             if ((path) && (strlen (path) == 0))
+               path = NULL;
              if (path
                  && gld${EMULATION_NAME}_search_needed (path, &n, force))
                break;
@@ -1751,6 +1753,8 @@ gld${EMULATION_NAME}_before_allocation (void)
   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)