From 4ffb6b6f1253a45f03f25e6d819f406d5c9ebf50 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sat, 15 Apr 2017 04:10:31 +0000 Subject: [PATCH 1/2] iscsi-scst/Makefile: Add support for make -i git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7132 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/iscsi-scst/Makefile b/iscsi-scst/Makefile index 9827cac51..1214121aa 100644 --- a/iscsi-scst/Makefile +++ b/iscsi-scst/Makefile @@ -114,7 +114,8 @@ else endif endif -run_conftest = $(shell if [ "0$(V)" -gt 0 ]; then output=/dev/stdout; else output=/dev/null; fi; if $(MAKE) -C $(KDIR) V=$(V) SUBDIRS="$(shell pwd)/conftest/$1" PRE_CFLAGS="-Werror $(OFED_CFLAGS)" 1>&2 2>$${output}; then echo "$(strip $2)"; else echo "$(strip $3)"; fi) +# Use make instead of $(MAKE) to get rid of command-line option -i +run_conftest = $(shell if [ "0$(V)" -gt 0 ]; then output=/dev/stdout; else output=/dev/null; fi; if MAKEFLAGS= make -C $(KDIR) V=$(V) SUBDIRS="$(shell pwd)/conftest/$1" PRE_CFLAGS="-Werror $(OFED_CFLAGS)" 1>&2 2>$${output}; then echo "$(strip $2)"; else echo "$(strip $3)"; fi) run_conftest_bool = $(call run_conftest,$1,-D$(strip $2)=1,-D$(strip $2)=0) CONFTESTS = $(shell ls -d conftest/*) From b58937bf628f248eca52311b52db5c0e919f4353 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sat, 15 Apr 2017 04:10:44 +0000 Subject: [PATCH 2/2] srpt/Makefile: Add support for make -i git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7133 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- srpt/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srpt/Makefile b/srpt/Makefile index 0078ee610..214edee8f 100644 --- a/srpt/Makefile +++ b/srpt/Makefile @@ -87,7 +87,8 @@ endif OFED_MODULE_SYMVERS:=$(OFED_KERNEL_DIR)/$(MODULE_SYMVERS) endif -run_conftest = $(shell if [ "0$(V)" -gt 0 ]; then output=/dev/stdout; else output=/dev/null; fi; if $(MAKE) -C $(KDIR) V=$(V) SUBDIRS="$(shell pwd)/conftest/$1" PRE_CFLAGS="-Werror $(OFED_CFLAGS)" 1>&2 2>$${output}; then echo "$(strip $2)"; else echo "$(strip $3)"; fi) +# Use make instead of $(MAKE) to get rid of command-line option -i +run_conftest = $(shell if [ "0$(V)" -gt 0 ]; then output=/dev/stdout; else output=/dev/null; fi; if MAKEFLAGS= make -C $(KDIR) V=$(V) SUBDIRS="$(shell pwd)/conftest/$1" PRE_CFLAGS="-Werror $(OFED_CFLAGS)" 1>&2 2>$${output}; then echo "$(strip $2)"; else echo "$(strip $3)"; fi) run_conftest_bool = $(call run_conftest,$1,-D$(strip $2)=1,-D$(strip $2)=0) CONFTESTS = $(shell ls -d conftest/*)