diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-05-15 12:22:50 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-05-15 12:22:50 +0000 |
| commit | bc5b8c65ef17547cbab9141d66798bbb3cae9c2a (patch) | |
| tree | c41d5e47bf1ebffbe2fc7461f0131e7a8b16dc49 /libc/nscd | |
| parent | c0ce886c9f6b0580924e4f21180602f5e72d6570 (diff) | |
Merge changes between r13800 and r13831 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@13832 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/nscd')
| -rw-r--r-- | libc/nscd/Makefile | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/libc/nscd/Makefile b/libc/nscd/Makefile index 15c3c7b9f..9e1821546 100644 --- a/libc/nscd/Makefile +++ b/libc/nscd/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1998,2000,2002-2009 Free Software Foundation, Inc. +# Copyright (C) 1998,2000,2002-2009,2011 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -45,9 +45,8 @@ nscd-modules += nis_hash endif ifeq ($(have-thread-library),yes) -ifneq (yesyes,$(have-fpie)$(build-shared)) others-$(OPTION_EGLIBC_INET) += nscd -endif +others-pie += nscd install-sbin-$(OPTION_EGLIBC_INET) += nscd extra-objs-$(OPTION_EGLIBC_INET) += $(nscd-modules:=.o) @@ -133,10 +132,7 @@ CFLAGS-res_hconf.c += $(nscd-cflags) CFLAGS-nis_hash.c += $(nscd-cflags) ifeq (yesyes,$(have-fpie)$(build-shared)) -relro-LDFLAGS += -Wl,-z,now - -$(objpfx)nscd: $(addprefix $(objpfx),$(nscd-modules:=.o)) - $(+link-pie) +LDFLAGS-nscd = -Wl,-z,now endif # This makes sure -DNOT_IN_libc is passed for all these modules. |