diff options
| author | Andreas Schwab <aschwab@redhat.com> | 2009-06-26 13:14:24 +0200 |
|---|---|---|
| committer | Andreas Schwab <aschwab@redhat.com> | 2009-06-26 13:14:24 +0200 |
| commit | a879c2cb1753c3aa868aa1e9d2107e9f0deb0dc2 (patch) | |
| tree | a919978ad8a178a0e6013f1ee43ab54f60a13493 /nscd | |
| parent | 5f9df8e7b478cafd4528a133201f4611a963292e (diff) | |
| parent | 44d20bca52ace85850012b0ead37b360e3ecd96e (diff) | |
Merge commit 'origin/master' into fedora/master
Diffstat (limited to 'nscd')
| -rw-r--r-- | nscd/Makefile | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/nscd/Makefile b/nscd/Makefile index 364ddfe8dd..4abae8c661 100644 --- a/nscd/Makefile +++ b/nscd/Makefile @@ -1,5 +1,4 @@ -# Copyright (C) 1998,2000,2002,2003,2004,2005,2006,2007,2008 -# Free Software Foundation, Inc. +# Copyright (C) 1998,2000,2002-2009 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 @@ -128,13 +127,7 @@ ifeq (yesyes,$(have-fpie)$(build-shared)) relro-LDFLAGS += -Wl,-z,now $(objpfx)nscd: $(addprefix $(objpfx),$(nscd-modules:=.o)) - $(LINK.o) -pie -Wl,-O1 $(nscd-cflags) \ - $(sysdep-LDFLAGS) $(config-LDFLAGS) $(relro-LDFLAGS) \ - $(extra-B-$(@F:lib%.so=%).so) -B$(csu-objpfx) \ - $(extra-B-$(@F:lib%.so=%).so) $(load-map-file) \ - $(LDFLAGS) $(LDFLAGS-$(@F)) \ - -L$(subst :, -L,$(rpath-link)) -Wl,-rpath-link=$(rpath-link) \ - -o $@ $^ $(LDLIBS-nscd) $(common-objpfx)libc_nonshared.a + $(+link-pie) endif # This makes sure -DNOT_IN_libc is passed for all these modules. |