From 556a6126f8764bc66d03368b5ac3e26631556559 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sat, 11 Dec 2021 23:08:32 +0100 Subject: hurd: Add rules for static PIE build This fixes [BZ #28671]. --- csu/Makefile | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'csu') diff --git a/csu/Makefile b/csu/Makefile index e2390e4a7d..b52a98ffda 100644 --- a/csu/Makefile +++ b/csu/Makefile @@ -71,17 +71,21 @@ else extra-objs += gmon-start.o endif +ifeq (yes,$(enable-static-pie)) +extra-objs += r$(start-installed-name) gr$(start-installed-name) +install-lib += r$(start-installed-name) gr$(start-installed-name) +endif + ifneq ($(start-installed-name),$(static-start-installed-name)) -# FIXME: Only Hurd defines static-start-installed-name. Hurd needs to -# provide special rules to support static PIE. extra-objs += $(static-start-installed-name) g$(static-start-installed-name) omit-deps += $(patsubst %.o,%,$(static-start-installed-name) \ g$(static-start-installed-name)) install-lib += $(static-start-installed-name) g$(static-start-installed-name) -else ifeq (yes,$(enable-static-pie)) -extra-objs += r$(start-installed-name) gr$(start-installed-name) -install-lib += r$(start-installed-name) gr$(start-installed-name) +extra-objs += r$(static-start-installed-name) gr$(static-start-installed-name) +omit-deps += $(patsubst %.o,%,r$(static-start-installed-name) \ + gr$(static-start-installed-name)) +install-lib += r$(static-start-installed-name) gr$(static-start-installed-name) endif endif @@ -150,6 +154,9 @@ ifneq ($(start-installed-name),$(static-start-installed-name)) $(objpfx)g$(static-start-installed-name): \ $(objpfx)g%: $(objpfx)% $(objpfx)gmon-start.o $(link-relocatable) +$(objpfx)gr$(static-start-installed-name): \ + $(objpfx)gr%: $(objpfx)r% $(objpfx)gmon-start.o + $(link-relocatable) endif else $(addprefix $(objpfx),$(sort g$(start-installed-name) \ -- cgit 1.4.1