diff options
| author | Andreas Schwab <schwab@redhat.com> | 2011-05-13 23:31:43 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-05-13 23:31:43 -0400 |
| commit | da62f81bdd23bb5095cd54c0b34ae6d5a93df69e (patch) | |
| tree | 1045b2d50648b4b24cfbcda07c3929bcad2da4f3 /nscd | |
| parent | 20030ae6d7e7187d7caf1b23c4aa5471fcf56d47 (diff) | |
| download | glibc-da62f81bdd23bb5095cd54c0b34ae6d5a93df69e.zip glibc-da62f81bdd23bb5095cd54c0b34ae6d5a93df69e.tar.gz glibc-da62f81bdd23bb5095cd54c0b34ae6d5a93df69e.tar.bz2 | |
Add support for generated PIE link rules
Diffstat (limited to 'nscd')
| -rw-r--r-- | nscd/Makefile | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/nscd/Makefile b/nscd/Makefile index 4abae8c..097e6f0 100644 --- a/nscd/Makefile +++ b/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 @@ -38,9 +38,8 @@ nscd-modules := nscd connections pwdcache getpwnam_r getpwuid_r grpcache \ ifeq ($(have-thread-library),yes) -ifneq (yesyes,$(have-fpie)$(build-shared)) others += nscd -endif +others-pie += nscd install-sbin := nscd extra-objs := $(nscd-modules:=.o) @@ -124,10 +123,7 @@ CFLAGS-getsrvbypt_r.c += $(nscd-cflags) CFLAGS-res_hconf.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. |