From e9e564ad59b8bd4a03e0f13b95b5122712e573e6 Mon Sep 17 00:00:00 2001 From: fengzh Date: Tue, 18 Jan 2022 16:18:19 +0900 Subject: [PATCH] Add LD option --build-id only at RPM-build time That option harms not only SunOS but also BSDs. It is required by rpmbuild so it is sensible to move the option from Makefile to SPEC file. --- Makefile | 4 ---- SPECS/pg_hint_plan14.spec | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile b/Makefile index f5057c5..3e27311 100644 --- a/Makefile +++ b/Makefile @@ -43,10 +43,6 @@ TARSOURCES = Makefile *.c *.h COPYRIGHT* \ doc/* expected/*.out sql/*.sql sql/maskout.sh \ data/data.csv input/*.source output/*.source SPECS/*.spec -ifneq ($(shell uname), SunOS) -LDFLAGS+=-Wl,--build-id -endif - installcheck: $(REGRESSION_EXPECTED) rpms: rpm14 diff --git a/SPECS/pg_hint_plan14.spec b/SPECS/pg_hint_plan14.spec index 26da951..fef6334 100644 --- a/SPECS/pg_hint_plan14.spec +++ b/SPECS/pg_hint_plan14.spec @@ -59,7 +59,7 @@ if [ ! -d %{_rpmdir} ]; then mkdir -p %{_rpmdir}; fi ## Set variables for build environment %build PATH=/usr/pgsql-14/bin:$PATH -make USE_PGXS=1 %{?_smp_mflags} +make USE_PGXS=1 LDFLAGS+=-Wl,--build-id %{?_smp_mflags} ## Set variables for install %install -- 2.11.0