- if ssp is enabled then make sure that __stack_chk_fail resolves

[uclinux-h8/uClibc.git] / libnsl / Makefile.in

diff --git a/libnsl/Makefile.in b/libnsl/Makefile.in
index 1c35417..0995b3c 100644 (file)
--- a/libnsl/Makefile.in
+++ b/libnsl/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org>
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
@@ -8,10 +8,15 @@
 CFLAGS-libnsl := -DNOT_IN_libc -DIS_IN_libnsl $(SSP_ALL_CFLAGS)
 
 LDFLAGS-libnsl.so := $(LDFLAGS)
+ifdef ASNEEDED
+ifeq ($(UCLIBC_HAS_SSP),y)
+LDFLAGS-libnsl.so += -Wl,--no-as-needed -lc -Wl,--as-needed
+endif
+endif
 
 LIBS-libnsl.so := $(LIBS)
 
-libnsl_FULL_NAME := libnsl-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
+libnsl_FULL_NAME := libnsl-$(VERSION).so
 
 libnsl_DIR := $(top_srcdir)libnsl
 libnsl_OUT := $(top_builddir)libnsl
@@ -26,29 +31,25 @@ libnsl-a-y := $(libnsl_OBJ)
 endif
 libnsl-so-y := $(libnsl_OBJ:.o=.os)
 
-libnsl-multi-y := $(libnsl_SRC)
-
 lib-a-y += $(top_builddir)lib/libnsl.a
 lib-so-y += $(top_builddir)lib/libnsl.so
 objclean-y += libnsl_clean
 
 ifeq ($(DOPIC),y)
-$(top_builddir)lib/libnsl.so: $(top_builddir)lib/libnsl.a $(libc)
+$(top_builddir)lib/libnsl.so: $(top_builddir)lib/libnsl.a $(libc.depend)
 else
-$(top_builddir)lib/libnsl.so: $(libnsl_OUT)/libnsl_so.a $(libc)
+$(top_builddir)lib/libnsl.so: $(libnsl_OUT)/libnsl_so.a $(libc.depend)
 endif
        $(call link.so,$(libnsl_FULL_NAME),$(MAJOR_VERSION))
 
 $(libnsl_OUT)/libnsl_so.a: $(libnsl-so-y)
        $(Q)$(RM) $@
-       $(do_strip)
        $(do_ar)
 
 $(top_builddir)lib/libnsl.a: $(libnsl-a-y)
        $(Q)$(INSTALL) -d $(dir $@)
        $(Q)$(RM) $@
-       $(do_strip)
        $(do_ar)
 
 libnsl_clean:
-       $(RM) $(libnsl_OUT)/*.{o,os,a}
+       $(do_rm) $(addprefix $(libnsl_OUT)/*., o os a)