From 21de9828cd981f41110aedffebb8d25cbc97925d Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 4 Nov 2018 04:28:58 +0000 Subject: [PATCH] Merge r7444 from trunk git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7697 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/iscsi-scst/Makefile b/iscsi-scst/Makefile index 4b5c94e3b..00ddfd2fb 100644 --- a/iscsi-scst/Makefile +++ b/iscsi-scst/Makefile @@ -122,12 +122,13 @@ CONFTEST_OUTPUTS = $(shell \ echo $$t/result-$(KVER).txt; \ done) -PRE_CFLAGS = $(OFED_CFLAGS) \ - -DOFED_FLAVOR=$(OFED_FLAVOR) \ - $(shell for t in $(CONFTESTS); do \ - cat $$t/result-$(KVER).txt 2>/dev/null; \ +PRE_CFLAGS = $(shell \ + for t in $(CONFTESTS); do \ + cat $$t/result-$(KVER).txt 2>/dev/null; \ done) +ISER_CFLAGS = $(OFED_CFLAGS) -DOFED_FLAVOR=$(OFED_FLAVOR) $(PRE_CFLAGS) + mods: include/iscsi_scst_itf_ver.h Modules.symvers Module.symvers \ $(CONFTEST_OUTPUTS) $(MAKE) -C $(KDIR) SCST_INC_DIR=$(SCST_INC_DIR) SUBDIRS=$(KMOD) \ @@ -136,7 +137,7 @@ mods: include/iscsi_scst_itf_ver.h Modules.symvers Module.symvers \ if $(INFINIBAND_ENABLED); then \ echo " Building against $(OFED_FLAVOR) InfiniBand kernel headers."; \ $(MAKE) -C $(KDIR) SCST_INC_DIR=$(SCST_INC_DIR) SUBDIRS=$(ISERTMOD) \ - PRE_CFLAGS="$(PRE_CFLAGS)" \ + PRE_CFLAGS="$(ISER_CFLAGS)" \ KBUILD_EXTRA_SYMBOLS=$(ISER_SYMVERS) modules; \ fi