1From 2cc2315eecaa48fd24792aaa889dc7d9fb96978b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 20 Mar 2017 22:18:44 -0700
4Subject: [PATCH] Makefiles: Respect environment variables and add LDFLAGS to
5 linker cmdline
6
7Fixes QA errors about GNU_HASH
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 mib-modules/Makefile | 10 +++++-----
12 tools/Makefile       |  2 +-
13 2 files changed, 6 insertions(+), 6 deletions(-)
14
15diff --git a/mib-modules/Makefile b/mib-modules/Makefile
16index 0d54c9b..051d4d2 100644
17--- a/mib-modules/Makefile
18+++ b/mib-modules/Makefile
19@@ -17,13 +17,13 @@ TARG		= iscsiTargetMib.so
20 OBJS		= iscsiTargetMib.o iscsiMib.o scsiMib.o ipsAuthMib.o \
21 		iscsiAuthData.o
22
23-CC		= gcc
24-CFLAGS		= -I$(INCLDIR) -I$(INCLDIR)/agent -I$(INCLDIR)/agent/mibgroup -shared -fPIC
25+CC		?= gcc
26+CFLAGS		+= -I$(INCLDIR) -I$(INCLDIR)/agent -I$(INCLDIR)/agent/mibgroup -shared -fPIC
27 CFLAGS		+= -I../include -Wall -Werror
28 #CFLAGS		+=$(AUTO_CFLAGS)
29
30-LD		= gcc -shared
31-
32+LD		?= gcc
33+LDFLAGS		+= -shared
34 INSTALL		= install
35
36 all: $(TARG)
37@@ -32,7 +32,7 @@ all: $(TARG)
38 	$(CC) $(CFLAGS) -o $@ -c $<
39
40 $(TARG): $(OBJS)
41-	$(LD) -o $@ $(OBJS)
42+	$(LD) -o $@ $(OBJS) $(LDFLAGS)
43
44 clean:
45 	rm -f $(OBJS) $(TARG)
46diff --git a/tools/Makefile b/tools/Makefile
47index 79ed3cd..ffd9bf3 100644
48--- a/tools/Makefile
49+++ b/tools/Makefile
50@@ -6,7 +6,7 @@ ISCSI_NAME_OBJS      = $(ISCSI_NAME_SRCS:.c=.o)
51 all:: $(ISCSI_NAME)
52
53 $(ISCSI_NAME): $(ISCSI_NAME_OBJS)
54-	$(CC) -o $@ $(CFLAGS) $(ISCSI_NAME_OBJS)
55+	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(ISCSI_NAME_OBJS)
56
57 clean:
58 	rm -f $(ISCSI_NAME_OBJS) $(ISCSI_NAME)
59--
602.12.0
61
62