summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2009-06-16 20:46:42 -0700
committerUlrich Drepper <drepper@redhat.com>2009-06-16 20:46:42 -0700
commitf051ddfe22d3db4e77d6a545d5363be8b986cb96 (patch)
tree0eb2454ecb7b16a095f107a6316f4d54dd7076a6
parentf60ddf9bf737e015f7da866ca7f46006b4ce9700 (diff)
Build pt_chown as PIE.
-rw-r--r--ChangeLog4
-rw-r--r--login/Makefile13
2 files changed, 17 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c91fe1f922..115cb8cde3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-16 Ulrich Drepper <drepper@redhat.com>
+
+ * login/Makefile: Build pt_chown as PIE.
+
2009-06-15 Andreas Schwab <aschwab@redhat.com>
* debug/xtrace.sh (do_help): Don't treat bug reporting message as
diff --git a/login/Makefile b/login/Makefile
index 427c050a89..beb2a5c3a8 100644
--- a/login/Makefile
+++ b/login/Makefile
@@ -54,10 +54,23 @@ otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \
$(resolvobjdir)/libresolv.a $(common-objpfx)libc.a
endif
+ifeq (yesyes,$(have-fpie)$(build-shared))
+pt_chown-cflags += $(pie-ccflag)
+endif
+ifeq (yes,$(have-ssp))
+pt_chown-cflags += -fstack-protector
+endif
ifeq (yes,$(have-libcap))
libcap = -lcap
endif
+CFLAGS-pt_chown.c = $(pt_chown-cflags)
LDLIBS-pt_chown = $(libcap)
+ifeq (yesyes,$(have-fpie)$(build-shared))
+LDFLAGS-pt_chown = -Wl,-z,now
+
+$(objpfx)pt_chown: $(objpfx)pt_chown.o
+ $(+link-pie)
+endif
# pt_chown needs to be setuid root.
$(inst_libexecdir)/pt_chown: $(objpfx)pt_chown $(+force)