diff --git a/fcst/Makefile b/fcst/Makefile
index ab7a71f4d..3b61baa1a 100644
--- a/fcst/Makefile
+++ b/fcst/Makefile
@@ -60,11 +60,13 @@ INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
 SCST_DIR := $(shell echo "$$PWD")/../scst/src
 
 all:
-	$(MAKE) -C $(KDIR) M=$(shell pwd)
+	$(MAKE) -C $(KDIR) M=$(shell pwd)			\
+	  $(shell [ -n "$(CC)" ] && echo CC="$(CC)")
 
 install: all
 	KDIR=$(KDIR) ../scripts/sign-modules
 	$(MAKE) -C $(KDIR) M=$(shell pwd)			\
+	  $(shell [ -n "$(CC)" ] && echo CC="$(CC)")		\
 	  $$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)")	\
 	  CONFIG_MODULE_SIG_ALL= modules_install
 
diff --git a/iscsi-scst/Makefile b/iscsi-scst/Makefile
index 7ac41c95d..6f9057389 100644
--- a/iscsi-scst/Makefile
+++ b/iscsi-scst/Makefile
@@ -110,7 +110,12 @@ run_conftest = $(shell							\
   else									\
     output=conftest/$1/build-output-$(KVER).txt;			\
   fi;									\
-  if MAKEFLAGS= make -C $(KDIR) V=$(V) M="$(shell pwd)/conftest/$1" CONFTEST_CFLAGS="-Werror $(OFED_CFLAGS)" $(OFED_CONFIG) KBUILD_EXTRA_SYMBOLS="$(OFED_MODULE_SYMVERS)" 1>&2 2>$${output}; then					\
+  if MAKEFLAGS= make -C $(KDIR) V=$(V)					\
+	$(shell [ -n "$(CC)" ] && echo CC="$(CC)")			\
+	M="$(shell pwd)/conftest/$1"					\
+	CONFTEST_CFLAGS="-Werror $(OFED_CFLAGS)" $(OFED_CONFIG)		\
+	KBUILD_EXTRA_SYMBOLS="$(OFED_MODULE_SYMVERS)"			\
+	1>&2 2>$${output}; then						\
     echo "$(strip $2)";							\
   else									\
     echo "$(strip $3)";							\
@@ -132,11 +137,13 @@ ISER_CFLAGS = $(OFED_CFLAGS) -DOFED_FLAVOR=$(OFED_FLAVOR) $(CONFTEST_CFLAGS)
 
 mods: include/iscsi_scst_itf_ver.h $(CONFTEST_OUTPUTS)
 	$(MAKE) -C $(KDIR) M=$(KMOD) CONFTEST_CFLAGS="$(CONFTEST_CFLAGS)"\
+	  $(shell [ -n "$(CC)" ] && echo CC="$(CC)")			\
 	  modules
 	echo "$@:  INFINIBAND_ENABLED = $(INFINIBAND_ENABLED)"
 	if $(INFINIBAND_ENABLED); then					\
 	  echo "  Building against $(OFED_FLAVOR) RDMA kernel headers.";\
 	  $(MAKE) -C $(KDIR) M=$(ISERTMOD) ISER_CFLAGS="$(ISER_CFLAGS)"	\
+	  $(shell [ -n "$(CC)" ] && echo CC="$(CC)")			\
 	  $(OFED_CONFIG) modules;					\
 	fi
 
@@ -158,12 +165,14 @@ install: all
 	@install -vD -m 644 doc/manpages/iscsi-scst-adm.8 $(DESTDIR)$(MANDIR)/man8/iscsi-scst-adm.8
 	(cd $(KMOD) && KDIR=$(KDIR) ../../scripts/sign-modules)
 	$(MAKE) -C $(KDIR) M=$(KMOD)				\
+	  $(shell [ -n "$(CC)" ] && echo CC="$(CC)")		\
 	  $$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)")	\
 	  CONFIG_MODULE_SIG_ALL= modules_install
 	echo "$@:  INFINIBAND_ENABLED = $(INFINIBAND_ENABLED)"
 	if $(INFINIBAND_ENABLED); then				\
 	  (cd $(ISERTMOD) && KDIR=$(KDIR) ../../../scripts/sign-modules);\
 	  $(MAKE) -C $(KDIR) M=$(ISERTMOD)			\
+	    $(shell [ -n "$(CC)" ] && echo CC="$(CC)")		\
 	    $$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)")	\
 	    CONFIG_MODULE_SIG_ALL= modules_install;		\
 	fi
diff --git a/iscsi-scst/kernel/isert-scst/Kbuild b/iscsi-scst/kernel/isert-scst/Kbuild
index 932a6bf87..2bfe301bf 100644
--- a/iscsi-scst/kernel/isert-scst/Kbuild
+++ b/iscsi-scst/kernel/isert-scst/Kbuild
@@ -15,9 +15,13 @@
 #  GNU General Public License for more details.
 
 LINUXINCLUDE := $(ISER_CFLAGS) $(LINUXINCLUDE)
-KBUILD_EXTRA_SYMBOLS=$(src)/../../kernel/Module.symvers			       \
-		$(shell for d in /usr/src/ofa_kernel/default/Module.symvers; do\
-			[ -e $$d ] || continue; echo $$d; break; done)
+ifdef CONFIG_CC_IS_CLANG
+KBUILD_EXTRA_SYMBOLS+=$(src)/../../../scst/src/Module.symvers
+endif
+KBUILD_EXTRA_SYMBOLS+=							\
+	$(src)/../../kernel/Module.symvers				\
+	$(shell for d in /usr/src/ofa_kernel/default/Module.symvers; do	\
+		[ -e $$d ] || continue; echo $$d; break; done)
 
 ccflags-y	+= -I$(src)/../../../scst/include
 ccflags-y	+= -I$(src)/../../include
diff --git a/qla2x00t-32gbit/Makefile b/qla2x00t-32gbit/Makefile
index dd4f889cc..3d06d5127 100644
--- a/qla2x00t-32gbit/Makefile
+++ b/qla2x00t-32gbit/Makefile
@@ -48,13 +48,15 @@ INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
 
 all:
 	$(MAKE) -C $(KDIR) M=$(shell pwd)				\
-		$(CONFIG_SCSI_QLA2XXX_TARGET)=CONFIG_SCSI_QLA2XXX_TARGET
+	  $(shell [ -n "$(CC)" ] && echo CC="$(CC)")			\
+	  $(CONFIG_SCSI_QLA2XXX_TARGET)=CONFIG_SCSI_QLA2XXX_TARGET
 
 install: all
 	KDIR=$(KDIR) ../scripts/sign-modules
 	$(MAKE) -C $(KDIR) M=$(shell pwd)				\
-		$$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)")	\
-		CONFIG_MODULE_SIG_ALL= modules_install
+	  $(shell [ -n "$(CC)" ] && echo CC="$(CC)")			\
+	  $$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)")		\
+	  CONFIG_MODULE_SIG_ALL= modules_install
 
 uninstall:
 	rm -f $(INSTALL_DIR)/qla2xxx_scst.ko
diff --git a/qla2x00t-32gbit/qla2x00-target/Makefile b/qla2x00t-32gbit/qla2x00-target/Makefile
index e541e9da3..c6115878b 100644
--- a/qla2x00t-32gbit/qla2x00-target/Makefile
+++ b/qla2x00t-32gbit/qla2x00-target/Makefile
@@ -67,7 +67,8 @@ INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
 SCST_DIR := $(shell echo "$$PWD/../../scst/src")
 
 all: $(QLA2XXX_SCST)
-	$(MAKE) -C $(KDIR) M=$(shell pwd)
+	$(MAKE) -C $(KDIR) M=$(shell pwd)			\
+	  $(shell [ -n "$(CC)" ] && echo CC="$(CC)")
 
 install: all
 ifneq ($(BUILD_2X_MODULE),)
@@ -75,6 +76,7 @@ ifneq ($(BUILD_2X_MODULE),)
 endif
 	KDIR=$(KDIR) ../../scripts/sign-modules
 	$(MAKE) -C $(KDIR) M=$(shell pwd)			\
+	  $(shell [ -n "$(CC)" ] && echo CC="$(CC)")		\
 	  $$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)")	\
 	  CONFIG_MODULE_SIG_ALL= modules_install
 
diff --git a/qla2x00t/Makefile b/qla2x00t/Makefile
index ce1ba74c6..89103bff3 100644
--- a/qla2x00t/Makefile
+++ b/qla2x00t/Makefile
@@ -47,13 +47,15 @@ INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
 
 all:
 	$(MAKE) -C $(KDIR) M=$(shell pwd)				\
-		$(CONFIG_SCSI_QLA2XXX_TARGET)=CONFIG_SCSI_QLA2XXX_TARGET
+	  $(shell [ -n "$(CC)" ] && echo CC="$(CC)")			\
+	  $(CONFIG_SCSI_QLA2XXX_TARGET)=CONFIG_SCSI_QLA2XXX_TARGET
 
 install: all
 	KDIR=$(KDIR) ../scripts/sign-modules
 	$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m			\
-		$$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)")	\
-		CONFIG_MODULE_SIG_ALL= modules_install
+	  $(shell [ -n "$(CC)" ] && echo CC="$(CC)")			\
+	  $$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)")		\
+	  CONFIG_MODULE_SIG_ALL= modules_install
 
 uninstall:
 	rm -f $(INSTALL_DIR)/qla2xxx_scst.ko
diff --git a/qla2x00t/qla2x00-target/Makefile b/qla2x00t/qla2x00-target/Makefile
index 89c239c25..f01b72d1f 100644
--- a/qla2x00t/qla2x00-target/Makefile
+++ b/qla2x00t/qla2x00-target/Makefile
@@ -66,7 +66,8 @@ INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
 SCST_DIR := $(shell echo "$$PWD/../../scst/src")
 
 all: $(QLA2XXX_SCST)
-	$(MAKE) -C $(KDIR) M=$(shell pwd)
+	$(MAKE) -C $(KDIR) M=$(shell pwd)			\
+	  $(shell [ -n "$(CC)" ] && echo CC="$(CC)")
 
 install: all
 ifneq ($(BUILD_2X_MODULE),)
@@ -74,6 +75,7 @@ ifneq ($(BUILD_2X_MODULE),)
 endif
 	KDIR=$(KDIR) ../../scripts/sign-modules
 	$(MAKE) -C $(KDIR) M=$(shell pwd)			\
+	  $(shell [ -n "$(CC)" ] && echo CC="$(CC)")		\
 	  $$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)")	\
 	  CONFIG_MODULE_SIG_ALL= modules_install
 
diff --git a/scst/src/Makefile b/scst/src/Makefile
index d611cb71f..f07778186 100644
--- a/scst/src/Makefile
+++ b/scst/src/Makefile
@@ -71,12 +71,16 @@ $(SCST_INTF_VER_FILE): $(SCST_INC_DIR)/scst.h $(SCST_INC_DIR)/scst_const.h $(SCS
 	echo "\"`sha1sum $(SCST_INC_DIR)/scst_user.h|awk '{printf $$1}'`\"" >>$(SCST_INTF_VER_FILE)
 
 all: $(SCST_INTF_VER_FILE)
-	$(MAKE) -C certs KDIR=$(KDIR)
-	$(MAKE) -C $(KDIR) M=$(shell pwd)
-	$(MAKE) -C $(KDIR) M=$(shell pwd)/dev_handlers
+	$(MAKE) -C certs KDIR=$(KDIR)				\
+	  $(shell [ -n "$(CC)" ] && echo CC="$(CC)")
+	$(MAKE) -C $(KDIR) M=$(shell pwd)			\
+	  $(shell [ -n "$(CC)" ] && echo CC="$(CC)")
+	$(MAKE) -C $(KDIR) M=$(shell pwd)/dev_handlers		\
+	  $(shell [ -n "$(CC)" ] && echo CC="$(CC)")
 
 scst:
-	$(MAKE) -C $(KDIR) M=$(shell pwd)
+	$(MAKE) -C $(KDIR) M=$(shell pwd)			\
+	  $(shell [ -n "$(CC)" ] && echo CC="$(CC)")
 
 install: all
 	@if [ -z "$(DESTDIR)" ] && \
@@ -93,10 +97,12 @@ install: all
 		/usr/sbin/weak-modules --remove-kernel;			\
 	fi
 	$(MAKE) -C $(KDIR) M=$(shell pwd)/dev_handlers			\
+	  $(shell [ -n "$(CC)" ] && echo CC="$(CC)")			\
 	  INSTALL_MOD_DIR=extra/dev_handlers				\
 	  $$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)")		\
 	  CONFIG_MODULE_SIG_ALL= modules_install
 	$(MAKE) -C $(KDIR) M=$(shell pwd)				\
+	  $(shell [ -n "$(CC)" ] && echo CC="$(CC)")			\
 	  $$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)")		\
 	  CONFIG_MODULE_SIG_ALL= modules_install
 	install -d $(INSTALL_DIR_H)
diff --git a/scst/src/dev_handlers/Makefile b/scst/src/dev_handlers/Makefile
index f6c2242ab..22b54de90 100644
--- a/scst/src/dev_handlers/Makefile
+++ b/scst/src/dev_handlers/Makefile
@@ -51,17 +51,20 @@ endif
 INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
 
 all:
-	$(MAKE) -C $(KDIR) M=$(shell pwd)
+	$(MAKE) -C $(KDIR) M=$(shell pwd)				\
+	  $(shell [ -n "$(CC)" ] && echo CC="$(CC)")
 
 %.lst: %.c
-	$(MAKE) -C $(KDIR) M=$(shell pwd) $@
+	$(MAKE) -C $(KDIR) M=$(shell pwd) $@				\
+	  $(shell [ -n "$(CC)" ] && echo CC="$(CC)")
 
 install: all
 	mkdir -p $(DESTDIR)/var/lib/scst/vdev_mode_pages
 	KDIR=$(KDIR) ../../../scripts/sign-modules
 	$(MAKE) -C $(KDIR) M=$(shell pwd)				\
-		$$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)")	\
-		CONFIG_MODULE_SIG_ALL= modules_install
+	  $(shell [ -n "$(CC)" ] && echo CC="$(CC)")			\
+	  $$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)")		\
+	  CONFIG_MODULE_SIG_ALL= modules_install
 
 uninstall:
 	rm -f $(INSTALL_DIR)/dev_handlers/scst_*.ko
diff --git a/scst_local/Makefile b/scst_local/Makefile
index 22273223a..24b2d2b29 100644
--- a/scst_local/Makefile
+++ b/scst_local/Makefile
@@ -34,13 +34,15 @@ INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
 SCST_DIR := $(shell echo "$$PWD")/../scst/src
 
 all:
-	$(MAKE) -C $(KDIR) M=$(shell pwd)
+	$(MAKE) -C $(KDIR) M=$(shell pwd)				\
+	  $(shell [ -n "$(CC)" ] && echo CC="$(CC)")
 
 install: all
 	KDIR=$(KDIR) ../scripts/sign-modules
 	$(MAKE) -C $(KDIR) M=$(shell pwd)				\
-		$$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)")	\
-		CONFIG_MODULE_SIG_ALL= modules_install
+	  $(shell [ -n "$(CC)" ] && echo CC="$(CC)")			\
+	  $$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)")		\
+	  CONFIG_MODULE_SIG_ALL= modules_install
 
 uninstall:
 	rm -f $(INSTALL_DIR)/scst_local.ko
diff --git a/srpt/Makefile b/srpt/Makefile
index bdbea9df0..117bbca3b 100644
--- a/srpt/Makefile
+++ b/srpt/Makefile
@@ -87,7 +87,12 @@ run_conftest = $(shell							\
   else									\
     output=conftest/$1/build-output-$(KVER).txt;			\
   fi;									\
-  if MAKEFLAGS= make -C $(KDIR) V=$(V) M="$(shell pwd)/conftest/$1" CONFTEST_CFLAGS="-Werror $(OFED_CFLAGS)" $(OFED_CONFIG) KBUILD_EXTRA_SYMBOLS="$(OFED_MODULE_SYMVERS)" 1>&2 2>$${output}; then					\
+  if MAKEFLAGS= make -C $(KDIR) V=$(V)					\
+	$(shell [ -n "$(CC)" ] && echo CC="$(CC)")			\
+	M="$(shell pwd)/conftest/$1"					\
+	CONFTEST_CFLAGS="-Werror $(OFED_CFLAGS)" $(OFED_CONFIG)		\
+	KBUILD_EXTRA_SYMBOLS="$(OFED_MODULE_SYMVERS)"			\
+	1>&2 2>$${output}; then						\
     echo "$(strip $2)";							\
   else									\
     echo "$(strip $3)";							\
@@ -107,16 +112,20 @@ CONFTEST_CFLAGS = $(OFED_CFLAGS)			\
 	done)
 
 all: check $(CONFTEST_OUTPUTS)
-	$(MAKE) -C $(KDIR) M=$(shell pwd)/src CONFTEST_CFLAGS="$(CONFTEST_CFLAGS)"\
-		$(OFED_CONFIG) modules
+	$(MAKE) -C $(KDIR) M=$(shell pwd)/src		\
+	  $(shell [ -n "$(CC)" ] && echo CC="$(CC)")	\
+	  CONFTEST_CFLAGS="$(CONFTEST_CFLAGS)"		\
+	  $(OFED_CONFIG) modules
 
 install: all
 	@[ -z "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && \
 	  find /lib/modules/$(KVER) -name ib_srpt.ko -exec rm {} \; ; \
 	  true
 	(cd src && KDIR=$(KDIR) ../../scripts/sign-modules)
-	$(MAKE) -C $(KDIR) M=$(shell pwd)/src CONFTEST_CFLAGS="$(CONFTEST_CFLAGS)" \
-	  $$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)")		 \
+	$(MAKE) -C $(KDIR) M=$(shell pwd)/src			\
+	  $(shell [ -n "$(CC)" ] && echo CC="$(CC)")		\
+	  CONFTEST_CFLAGS="$(CONFTEST_CFLAGS)"			\
+	  $$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)")	\
 	  CONFIG_MODULE_SIG_ALL= modules_install
 
 uninstall: