diff --git a/pkgs/development/libraries/glibc-2.12/common.nix b/pkgs/development/libraries/glibc-2.12/common.nix index af36787139bf..8786f8895ab1 100644 --- a/pkgs/development/libraries/glibc-2.12/common.nix +++ b/pkgs/development/libraries/glibc-2.12/common.nix @@ -69,9 +69,6 @@ stdenv.mkDerivation ({ /* Have rpcgen(1) look for cpp(1) in $PATH. */ ./rpcgen-path.patch - /* Make sure `nscd' et al. are linked against `libssp'. */ - ./stack-protector-link.patch - /* Fix for the check of -fgnu89-inline compiler flag */ ./gnu89-inline.patch diff --git a/pkgs/development/libraries/glibc-2.12/stack-protector-link.patch b/pkgs/development/libraries/glibc-2.12/stack-protector-link.patch deleted file mode 100644 index d200ece52df7..000000000000 --- a/pkgs/development/libraries/glibc-2.12/stack-protector-link.patch +++ /dev/null @@ -1,12 +0,0 @@ -Make sure `nscd' et al. are linked against `libssp'. - ---- glibc-2.11/nscd/Makefile 2009-10-30 18:17:08.000000000 +0100 -+++ glibc-2.11/nscd/Makefile 2009-11-22 01:19:37.000000000 +0100 -@@ -126,6 +126,7 @@ CFLAGS-res_hconf.c += $(nscd-cflags) - ifeq (yesyes,$(have-fpie)$(build-shared)) - relro-LDFLAGS += -Wl,-z,now - -+$(objpfx)nscd: LDFLAGS += -lssp - $(objpfx)nscd: $(addprefix $(objpfx),$(nscd-modules:=.o)) - $(+link-pie) - endif