From 8eb850acced736934ef68adc2092bbc1f8ecf992 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sat, 5 Dec 2020 18:39:38 +0000 Subject: [PATCH] Revert "Make it possible to build SCST with clang" Since commit ecea60a694e2 breaks cross-compilation, revert it. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9208 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- fcst/Makefile | 4 +--- iscsi-scst/Makefile | 5 ----- qla2x00t-32gbit/Makefile | 2 -- qla2x00t-32gbit/qla2x00-target/Makefile | 4 +--- qla2x00t/Makefile | 2 -- qla2x00t/qla2x00-target/Makefile | 4 +--- scst/src/Makefile | 14 ++++---------- scst/src/dev_handlers/Makefile | 7 ++----- scst_local/Makefile | 4 +--- srpt/Makefile | 3 --- 10 files changed, 10 insertions(+), 39 deletions(-) diff --git a/fcst/Makefile b/fcst/Makefile index 3b61baa1a..ab7a71f4d 100644 --- a/fcst/Makefile +++ b/fcst/Makefile @@ -60,13 +60,11 @@ INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra SCST_DIR := $(shell echo "$$PWD")/../scst/src all: - $(MAKE) -C $(KDIR) M=$(shell pwd) \ - $(shell [ -n "$(CC)" ] && echo CC="$(CC)") + $(MAKE) -C $(KDIR) M=$(shell pwd) 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 6f9057389..eb98f2c9d 100644 --- a/iscsi-scst/Makefile +++ b/iscsi-scst/Makefile @@ -111,7 +111,6 @@ run_conftest = $(shell \ output=conftest/$1/build-output-$(KVER).txt; \ fi; \ 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)" \ @@ -137,13 +136,11 @@ 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 @@ -165,14 +162,12 @@ 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/qla2x00t-32gbit/Makefile b/qla2x00t-32gbit/Makefile index 3d06d5127..d20757f90 100644 --- a/qla2x00t-32gbit/Makefile +++ b/qla2x00t-32gbit/Makefile @@ -48,13 +48,11 @@ INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra all: $(MAKE) -C $(KDIR) M=$(shell pwd) \ - $(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) \ - $(shell [ -n "$(CC)" ] && echo CC="$(CC)") \ $$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)") \ CONFIG_MODULE_SIG_ALL= modules_install diff --git a/qla2x00t-32gbit/qla2x00-target/Makefile b/qla2x00t-32gbit/qla2x00-target/Makefile index c6115878b..e541e9da3 100644 --- a/qla2x00t-32gbit/qla2x00-target/Makefile +++ b/qla2x00t-32gbit/qla2x00-target/Makefile @@ -67,8 +67,7 @@ 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) \ - $(shell [ -n "$(CC)" ] && echo CC="$(CC)") + $(MAKE) -C $(KDIR) M=$(shell pwd) install: all ifneq ($(BUILD_2X_MODULE),) @@ -76,7 +75,6 @@ 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 89103bff3..b68c9bcf8 100644 --- a/qla2x00t/Makefile +++ b/qla2x00t/Makefile @@ -47,13 +47,11 @@ INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra all: $(MAKE) -C $(KDIR) M=$(shell pwd) \ - $(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 \ - $(shell [ -n "$(CC)" ] && echo CC="$(CC)") \ $$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)") \ CONFIG_MODULE_SIG_ALL= modules_install diff --git a/qla2x00t/qla2x00-target/Makefile b/qla2x00t/qla2x00-target/Makefile index f01b72d1f..89c239c25 100644 --- a/qla2x00t/qla2x00-target/Makefile +++ b/qla2x00t/qla2x00-target/Makefile @@ -66,8 +66,7 @@ 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) \ - $(shell [ -n "$(CC)" ] && echo CC="$(CC)") + $(MAKE) -C $(KDIR) M=$(shell pwd) install: all ifneq ($(BUILD_2X_MODULE),) @@ -75,7 +74,6 @@ 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 30337d3bc..21b2dfc6a 100644 --- a/scst/src/Makefile +++ b/scst/src/Makefile @@ -71,16 +71,12 @@ $(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) \ - $(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)") + $(MAKE) -C certs KDIR=$(KDIR) + $(MAKE) -C $(KDIR) M=$(shell pwd) + $(MAKE) -C $(KDIR) M=$(shell pwd)/dev_handlers scst: - $(MAKE) -C $(KDIR) M=$(shell pwd) \ - $(shell [ -n "$(CC)" ] && echo CC="$(CC)") + $(MAKE) -C $(KDIR) M=$(shell pwd) install: all @if [ -z "$(DESTDIR)" ] && \ @@ -97,12 +93,10 @@ 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 22b54de90..f05c60cb4 100644 --- a/scst/src/dev_handlers/Makefile +++ b/scst/src/dev_handlers/Makefile @@ -51,18 +51,15 @@ endif INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra all: - $(MAKE) -C $(KDIR) M=$(shell pwd) \ - $(shell [ -n "$(CC)" ] && echo CC="$(CC)") + $(MAKE) -C $(KDIR) M=$(shell pwd) %.lst: %.c - $(MAKE) -C $(KDIR) M=$(shell pwd) $@ \ - $(shell [ -n "$(CC)" ] && echo CC="$(CC)") + $(MAKE) -C $(KDIR) M=$(shell pwd) $@ install: all mkdir -p $(DESTDIR)/var/lib/scst/vdev_mode_pages 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_local/Makefile b/scst_local/Makefile index 24b2d2b29..e5de8b8df 100644 --- a/scst_local/Makefile +++ b/scst_local/Makefile @@ -34,13 +34,11 @@ INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra SCST_DIR := $(shell echo "$$PWD")/../scst/src all: - $(MAKE) -C $(KDIR) M=$(shell pwd) \ - $(shell [ -n "$(CC)" ] && echo CC="$(CC)") + $(MAKE) -C $(KDIR) M=$(shell pwd) 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/srpt/Makefile b/srpt/Makefile index 117bbca3b..6d62ec750 100644 --- a/srpt/Makefile +++ b/srpt/Makefile @@ -88,7 +88,6 @@ run_conftest = $(shell \ output=conftest/$1/build-output-$(KVER).txt; \ fi; \ 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)" \ @@ -113,7 +112,6 @@ CONFTEST_CFLAGS = $(OFED_CFLAGS) \ all: check $(CONFTEST_OUTPUTS) $(MAKE) -C $(KDIR) M=$(shell pwd)/src \ - $(shell [ -n "$(CC)" ] && echo CC="$(CC)") \ CONFTEST_CFLAGS="$(CONFTEST_CFLAGS)" \ $(OFED_CONFIG) modules @@ -123,7 +121,6 @@ install: all true (cd src && KDIR=$(KDIR) ../../scripts/sign-modules) $(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