diff options
| author | Roland McGrath <roland@gnu.org> | 1996-06-11 21:07:00 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1996-06-11 21:07:00 +0000 |
| commit | 852fc4b91e0c657e02c7d15bc24fbbae066ccae3 (patch) | |
| tree | 16e0d249a0b7b0f6d47a410cdfdfe890d7a898cb /Makeconfig | |
| parent | 6ba35316626b0aec32d29b7307965de4f4bb59fb (diff) | |
* elf/Makefile ($(objpfx)$(rtld-installed-name)): New target to make
link to ld.so if that is not the installed name.
(lib-noranlib): Depend on the installed name in the build directory
instead of on ld.so.
* Makeconfig (link-libc): Include $(elfobjdir)/$(rtld-installed-name)
between libc.so and libc.a, because with libc.so's DT_NEEDED for ld.so
ld searches libc.a before ld.so (is that an ld bug?).
Add $(elfobjdir) to -rpath-link.
* Makerules (elfobjdir): Define as . when $(subdir) is elf.
* sysdeps/i386/dl-machine.h (elf_machine_rel): In R_386_32 case when
relocating _dl_rtld_map, subtract SYM's value from final reloc value,
but don't change *RELOC_ADDR before calling *RESOLVE, because it might
call the function we are relocating!
Diffstat (limited to 'Makeconfig')
| -rw-r--r-- | Makeconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makeconfig b/Makeconfig index d2bbbb2517..0bb64bc288 100644 --- a/Makeconfig +++ b/Makeconfig @@ -312,8 +312,9 @@ ifeq (yes,$(build-shared)) # We need the versioned name of libc.so in the deps of $(others) et al # so that the symlink to libc.so is created before anything tries to # run the linked programs. -link-libc = -Wl,-rpath-link=$(common-objdir) \ +link-libc = -Wl,-rpath-link=$(common-objdir):$(elfobjdir) \ $(common-objpfx)libc.so$(libc.so-version) \ + $(elfobjdir)/$(rtld-installed-name) \ $(common-objpfx)libc.a $(gnulib) # Choose the default search path for the dynamic linker based on # where we will install libraries. |