1 Don't generate RPATH if we're going to be generating RUNPATH.
3 need to ponder what ramifications this has before enabling it
5 --- binutils/bfd/elflink.c
6 +++ binutils/bfd/elflink.c
7 @@ -5382,11 +5382,15 @@
9 indx = _bfd_elf_strtab_add (elf_hash_table (info)->dynstr, rpath,
11 - if (indx == (bfd_size_type) -1
12 - || !_bfd_elf_add_dynamic_entry (info, DT_RPATH, indx))
13 + if (indx == (bfd_size_type) -1)
16 - if (info->new_dtags)
17 + if (!info->new_dtags)
19 + if (!_bfd_elf_add_dynamic_entry (info, DT_RPATH, indx))
24 _bfd_elf_strtab_addref (elf_hash_table (info)->dynstr, indx);
25 if (!_bfd_elf_add_dynamic_entry (info, DT_RUNPATH, indx))