Update.

[jlayton/glibc.git] / elf / Makefile

diff --git a/elf/Makefile b/elf/Makefile
index 85dba53f9946121edac07bef1a24712206418869..5fe73e7171e1912e33b251efed0faa57cdc11ea0 100644 (file)
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -103,11 +103,13 @@ $(objpfx)rtld-ldscript: $(rtld-ldscript-in) $(rtld-parms)
 $(objpfx)ld.so: $(objpfx)librtld.os $(objpfx)rtld-ldscript
        $(rtld-link) -Wl,-soname=$(rtld-installed-name)
 
+RTLD-VERSIONS=$(addprefix -Wl,--version-script=,$(libc-map))
+
 define rtld-link
 $(LINK.o) -nostdlib -nostartfiles -shared -o $@ \
          -Wl,-rpath=$(default-rpath) $(LDFLAGS-rtld) \
          $(filter-out $(objpfx)rtld-ldscript,$^) \
-         -Wl,--version-script=$(libc-map)
+         $(RTLD-VERSIONS)
 endef
 else
 $(objpfx)ld.so: $(objpfx)librtld.os
@@ -115,8 +117,7 @@ $(objpfx)ld.so: $(objpfx)librtld.os
 
 define rtld-link
 $(LINK.o) -nostdlib -nostartfiles -shared -o $@ \
-         -Wl,-rpath=$(default-rpath) $^ \
-         -Wl,--version-script=$(libc-map)
+         -Wl,-rpath=$(default-rpath) $^ $(RTLD-VERSIONS)
 endef
 endif