yann@1614: Don't generate RPATH if we're going to be generating RUNPATH.
yann@1614: 
yann@1614: need to ponder what ramifications this has before enabling it
yann@1614: 
yann@1614: --- binutils/bfd/elflink.c
yann@1614: +++ binutils/bfd/elflink.c
yann@1614: @@ -5382,11 +5382,15 @@
yann@1614:  
yann@1614:  	  indx = _bfd_elf_strtab_add (elf_hash_table (info)->dynstr, rpath,
yann@1614:  				      TRUE);
yann@1614: -	  if (indx == (bfd_size_type) -1
yann@1614: -	      || !_bfd_elf_add_dynamic_entry (info, DT_RPATH, indx))
yann@1614: +	  if (indx == (bfd_size_type) -1)
yann@1614:  	    return FALSE;
yann@1614:  
yann@1614: -	  if  (info->new_dtags)
yann@1614: +	  if (!info->new_dtags)
yann@1614: +	    {
yann@1614: +	      if (!_bfd_elf_add_dynamic_entry (info, DT_RPATH, indx))
yann@1614: +		return FALSE;
yann@1614: +	    }
yann@1614: +	  else
yann@1614:  	    {
yann@1614:  	      _bfd_elf_strtab_addref (elf_hash_table (info)->dynstr, indx);
yann@1614:  	      if (!_bfd_elf_add_dynamic_entry (info, DT_RUNPATH, indx))