From 34a9182814ae565d6f430f85cfe80c05fa9f2dda Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Tue, 24 Jul 2018 17:55:32 +0800 Subject: [PATCH] respect-ldflags-also-from-bin_ldflags Upstream-Status: Inappropriate[oe-specific] update original patch to version 4.0.7 Signed-off-by: Changqing Li --- dlm_controld/Makefile | 4 ++-- dlm_tool/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlm_controld/Makefile b/dlm_controld/Makefile index cf556c9..3381730 100644 --- a/dlm_controld/Makefile +++ b/dlm_controld/Makefile @@ -55,11 +55,11 @@ BIN_CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ BIN_CFLAGS += -fPIE -DPIE BIN_CFLAGS += -I../include -I../libdlm -BIN_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie +BIN_LDFLAGS += $(LDFLAGS) -Wl,-z,now -Wl,-z,relro -pie BIN_LDFLAGS += -lpthread -lrt -lcpg -lcmap -lcfg -lquorum LIB_CFLAGS += $(BIN_CFLAGS) -LIB_LDFLAGS += -Wl,-z,relro -pie +LIB_LDFLAGS += $(LDFLAGS) -Wl,-z,relro -pie ifeq ($(USE_SD_NOTIFY),yes) BIN_CFLAGS += $(shell pkg-config --cflags libsystemd) \ diff --git a/dlm_tool/Makefile b/dlm_tool/Makefile index c16d8f5..a48a26f 100644 --- a/dlm_tool/Makefile +++ b/dlm_tool/Makefile @@ -32,7 +32,7 @@ BIN_CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ BIN_CFLAGS += -fPIE -DPIE BIN_CFLAGS += -I../include -I../libdlm -I../dlm_controld -BIN_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie +BIN_LDFLAGS += $(LDFLAGS) -Wl,-z,now -Wl,-z,relro -pie BIN_LDFLAGS += -L../libdlm -L../dlm_controld BIN_LDFLAGS += -lpthread -ldlm -ldlmcontrol -- 2.7.4