diff options
| author | Peter S. Mazinger <ps.m@gmx.net> | 2005-10-27 23:41:18 +0000 |
|---|---|---|
| committer | Peter S. Mazinger <ps.m@gmx.net> | 2005-10-27 23:41:18 +0000 |
| commit | 536ecd7044fe3dfb45bbb1dea6c93b3eda42bfd8 (patch) | |
| tree | e1fe20cac121b11f52d7f9a08b0e705acfa36c29 /Makefile.in | |
| parent | 237277e9a8133c64026b736b1427141e71655330 (diff) | |
Allow using ssp w/ current active Makefiles too. Build crts for non-shared archs too.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in index d80b1d8ef..8d8065696 100644 --- a/Makefile.in +++ b/Makefile.in @@ -234,6 +234,19 @@ ifeq ($(HAVE_SHARED),y) $(RM) $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \ sed -e '/^GROUP/d' $(top_builddir)lib/libc.so > $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \ fi +ifeq ($(UCLIBC_HAS_SSP),y) +ifeq ($(COMPAT_ATEXIT),y) + if [ -f $(top_builddir)lib/libc.so -a -f $(PREFIX)$(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME) ] ; then \ + echo "GROUP ( $(DEVEL_PREFIX)lib/$(NONSHARED_LIBNAME) $(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME) AS_NEEDED ( $(RUNTIME_PREFIX)lib/$(UCLIBC_LDSO) ) )" \ + >> $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \ + fi +else + if [ -f $(top_builddir)lib/libc.so -a -f $(PREFIX)$(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME) ] ; then \ + echo "GROUP ( $(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME) $(DEVEL_PREFIX)lib/$(NONSHARED_LIBNAME) AS_NEEDED ( $(RUNTIME_PREFIX)lib/$(UCLIBC_LDSO) ) )" \ + >> $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \ + fi +endif +else ifeq ($(COMPAT_ATEXIT),y) if [ -f $(top_builddir)lib/libc.so -a -f $(PREFIX)$(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME) ] ; then \ echo "GROUP ( $(DEVEL_PREFIX)lib/$(NONSHARED_LIBNAME) $(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME) )" \ @@ -245,6 +258,7 @@ else >> $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \ fi endif +endif ifeq ($(PTHREADS_DEBUG_SUPPORT),y) $(LN) -sf $(RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB)libthread_db.so.1 \ $(PREFIX)$(DEVEL_PREFIX)lib/libthread_db.so |