diff options
| author | Lee Duncan <lduncan@suse.com> | 2018-01-22 08:54:41 -0800 |
|---|---|---|
| committer | Lee Duncan <lduncan@suse.com> | 2018-01-22 08:54:41 -0800 |
| commit | ac6abce2b642dc1159703d95e98401a8fc29351b (patch) | |
| tree | 217c979b925983235a91f24956479fd0f620f442 | |
| parent | 36204c711526162b68fc9c0228bfb48ad8b1d5c0 (diff) | |
| download | open-iscsi-ac6abce2b642dc1159703d95e98401a8fc29351b.tar.gz | |
Do not set LDFLAGS directly in usr/Makefile
We were setting LDFLAGS for libopeniscsiusr, but
that is overridden by any value passed in on the command
line, which is not what was intended. Instead, use
a new/different variable for this.
| -rw-r--r-- | usr/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr/Makefile b/usr/Makefile index 8fbac4a..f9445ad 100644 --- a/usr/Makefile +++ b/usr/Makefile @@ -36,7 +36,7 @@ CFLAGS ?= -O2 -g WARNFLAGS ?= -Wall -Wstrict-prototypes CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \ -I$(TOPDIR)/libopeniscsiusr -LDFLAGS += -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr +ISCSI_LIB = -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr PROGRAMS = iscsid iscsiadm iscsistart # libc compat files @@ -60,14 +60,14 @@ all: $(PROGRAMS) iscsid: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \ iscsid.o session_mgmt.o discoveryd.o mntcheck.o - $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lisns -lcrypto -lrt -lmount + $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lisns -lcrypto -lrt -lmount $(ISCSI_LIB) iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o mntcheck.o - $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lisns -lcrypto -lmount + $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lisns -lcrypto -lmount $(ISCSI_LIB) iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ iscsistart.o statics.o - $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lrt + $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lrt $(ISCSI_LIB) clean: rm -f *.o $(PROGRAMS) .depend $(LIBSYS) |