From fab7ce3f5b4060bf62659e8b58529de4156b5a2f Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 31 May 2013 16:16:33 +0000 Subject: Link extra-libs consistently with libc and ld.so. --- iconvdata/extra-module.mk | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'iconvdata/extra-module.mk') diff --git a/iconvdata/extra-module.mk b/iconvdata/extra-module.mk index 43f4e12fb7..ecaf507624 100644 --- a/iconvdata/extra-module.mk +++ b/iconvdata/extra-module.mk @@ -4,16 +4,9 @@ extra-modules-left := $(strip $(filter-out $(mod),$(extra-modules-left))) extra-objs := $(extra-objs) $(patsubst %,%.os,$($(mod)-routines)) $(objpfx)$(mod).so: $(addprefix $(objpfx),$(addsuffix .os,$($(mod)-routines)))\ - $(shlib-lds) + $(shlib-lds) $(link-libc-deps) $(build-module-asneeded) -# Depend on libc.so so a DT_NEEDED is generated in the shared objects. -# This ensures they will load libc.so for needed symbols if loaded by -# a statically-linked program that hasn't already loaded it. -$(objpfx)$(mod).so: $(common-objpfx)libc.so \ - $(common-objpfx)/elf/ld.so \ - $(common-objpfx)libc_nonshared.a - ifneq (,$(extra-modules-left)) include extra-module.mk endif -- cgit v1.2.3