diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2013-05-31 16:16:33 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2013-05-31 16:16:33 +0000 |
| commit | fab7ce3f5b4060bf62659e8b58529de4156b5a2f (patch) | |
| tree | 478613d49200afe992092d00c61f6fb82cec07b8 /iconvdata | |
| parent | eca5920cd90093d8921f27bfbf7bcf54807165bb (diff) | |
| download | glibc-fab7ce3f5b4060bf62659e8b58529de4156b5a2f.zip glibc-fab7ce3f5b4060bf62659e8b58529de4156b5a2f.tar.gz glibc-fab7ce3f5b4060bf62659e8b58529de4156b5a2f.tar.bz2 | |
Link extra-libs consistently with libc and ld.so.
Diffstat (limited to 'iconvdata')
| -rw-r--r-- | iconvdata/extra-module.mk | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/iconvdata/extra-module.mk b/iconvdata/extra-module.mk index 43f4e12..ecaf507 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 |