From 25d7aa2faef0c36f053ee1ba418fe14022ef6f7c Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Tue, 27 Feb 2018 11:49:44 -0600 Subject: [PATCH] ipvsadm: use CFLAGS and LDFLAGS environment variables Signed-off-by: Ryan O'Hara --- Makefile | 6 +++--- libipvs/Makefile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 91a2991..2a1d179 100644 --- a/Makefile +++ b/Makefile @@ -46,9 +46,9 @@ INSTALL = install STATIC_LIBS = libipvs/libipvs.a ifeq "${ARCH}" "sparc64" - CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -m64 -pipe -mcpu=ultrasparc -mcmodel=medlow + CFLAGS += -Wall -Wunused -Wstrict-prototypes -g -m64 -pipe -mcpu=ultrasparc -mcmodel=medlow else - CFLAGS = -Wall -Wunused -Wstrict-prototypes -g + CFLAGS += -Wall -Wunused -Wstrict-prototypes -g endif @@ -87,7 +87,7 @@ libs: make -C libipvs ipvsadm: $(OBJS) $(STATIC_LIBS) - $(CC) $(CFLAGS) -o $@ $^ $(LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) install: all if [ ! -d $(SBIN) ]; then $(MKDIR) -p $(SBIN); fi diff --git a/libipvs/Makefile b/libipvs/Makefile index f845c8b..780f3f3 100644 --- a/libipvs/Makefile +++ b/libipvs/Makefile @@ -1,7 +1,7 @@ # Makefile for libipvs CC = gcc -CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -fPIC +CFLAGS += -Wall -Wunused -Wstrict-prototypes -g -fPIC ifneq (0,$(HAVE_NL)) CFLAGS += -DLIBIPVS_USE_NL CFLAGS += $(shell \ -- 2.14.3