diff options
| author | Peter S. Mazinger <ps.m@gmx.net> | 2005-10-28 13:52:36 +0000 |
|---|---|---|
| committer | Peter S. Mazinger <ps.m@gmx.net> | 2005-10-28 13:52:36 +0000 |
| commit | 7eb68fa07eacefbf1319fea2117dfc17d57aab5e (patch) | |
| tree | 0b6806bca39496d7347ee12e420ec1aa2f7d31b0 /Makerules | |
| parent | 7e4a84fbea5c0049056b3e5f80221675b7737b5b (diff) | |
Remove binutils-2.16.1 dependency for SSP, now it works with any binutils, but all apps linked against libc.so will get DT_NEEDED for ld.so too
Diffstat (limited to 'Makerules')
| -rw-r--r-- | Makerules | 14 |
1 files changed, 3 insertions, 11 deletions
@@ -114,7 +114,7 @@ libc=$(top_builddir)lib/libc.so interp=$(top_builddir)libc/misc/internals/interp.os ifeq ($(strip $(EXTRA_LINK_LIBS)),) #EXTRA_LINK_LIBS:=$(interp) -L$(top_builddir)lib -lc $(LDADD_LIBFLOAT) $(LIBGCC) -EXTRA_LINK_LIBS:=$(interp) $(libc) $(LDADD_LIBFLOAT) $(LIBGCC) +EXTRA_LINK_LIBS:=$(interp) -L$(top_builddir)lib $(libc) $(LDADD_LIBFLOAT) $(LIBGCC) endif ifneq ($(strip $(LIB_NAME)),libc) @@ -141,18 +141,10 @@ else echo "/* GNU ld script" > $@ echo " * Use the shared library, but some functions are only in" >> $@ echo " * the static library, so try that secondarily. */" >> $@ -ifeq ($(UCLIBC_HAS_SSP),y) ifeq ($(COMPAT_ATEXIT),y) - echo "GROUP ( $(top_builddir)lib/$(NONSHARED_LIBNAME) $(top_builddir)lib/$(SHARED_MAJORNAME) AS_NEEDED ( $(top_builddir)lib/$(UCLIBC_LDSO) ) )" >> $@ + echo "GROUP ( $(NONSHARED_LIBNAME) $(SHARED_MAJORNAME) $(ASNEEDED) )" >> $@ else - echo "GROUP ( $(top_builddir)lib/$(SHARED_MAJORNAME) $(top_builddir)lib/$(NONSHARED_LIBNAME) AS_NEEDED ( $(top_builddir)lib/$(UCLIBC_LDSO) ) )" >> $@ -endif -else -ifeq ($(COMPAT_ATEXIT),y) - echo "GROUP ( $(top_builddir)lib/$(NONSHARED_LIBNAME) $(top_builddir)lib/$(SHARED_MAJORNAME) )" >> $@ -else - echo "GROUP ( $(top_builddir)lib/$(SHARED_MAJORNAME) $(top_builddir)lib/$(NONSHARED_LIBNAME) )" >> $@ -endif + echo "GROUP ( $(SHARED_MAJORNAME) $(NONSHARED_LIBNAME) $(ASNEEDED) )" >> $@ endif endif |