diff options
| author | H.J. Lu <hongjiu.lu@intel.com> | 2009-06-16 09:19:59 -0700 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2009-06-16 09:19:59 -0700 |
| commit | 435aa54b3b9c1c87498e8bb3831394fd42220fa7 (patch) | |
| tree | b5de40c20afead258bbae697c625f86330c7ec52 /nscd | |
| parent | 25bfbb9e0e610afaf6b67e5ee1a1a5338018c42e (diff) | |
| download | glibc-435aa54b3b9c1c87498e8bb3831394fd42220fa7.tar.gz | |
Consolidate PIE linking Makefile rules.
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. |