diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-02-08 16:44:31 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-02-08 16:44:31 +0000 |
| commit | 78be84cd747c2e3965bf6c2fd5f702d6ff2f5525 (patch) | |
| tree | c070a60ef7c5371bef8b7a559442a6920b394c8e /libc/resolv/Makefile | |
| parent | de06548e980675e65a1e6d850bb8c3a3f7ec638d (diff) | |
Merge changes between r16568 and r17050 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@17051 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/resolv/Makefile')
| -rw-r--r-- | libc/resolv/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/resolv/Makefile b/libc/resolv/Makefile index 95654a4be..6ddf91475 100644 --- a/libc/resolv/Makefile +++ b/libc/resolv/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1994-2001,2003,2004,2007,2008,2011 +# Copyright (C) 1994-2001,2003,2004,2007,2008,2011,2012 # Free Software Foundation, Inc. # This file is part of the GNU C Library. @@ -94,7 +94,7 @@ CFLAGS-res_hconf.c = -fexceptions $(objpfx)libresolv.so: $(common-objpfx)libc.so $(common-objpfx)libc_nonshared.a # Some hosts need '__stack_chk_guard', so pull in the definition from # ld.so if required. -ifeq (yesyes,$(have-ssp)$(elf)) +ifeq (yes,$(have-ssp)) LDLIBS-resolv.so += $(as-needed) $(elfobjdir)/ld.so $(no-as-needed) endif |