kbuild: remove cc-name variable (99516742) · Commits · 戴 / test

There is one more user of $(cc-name) in the top Makefile. It is supposed to detect Clang before invoking Kconfig, so it should still be there in the $(shell ...) form. All the other users of $(cc-name) have been replaced with $(CONFIG_CC_IS_CLANG). Hence, scripts/Kbuild.include does not need to define cc-name any more. Signed-off-by:

Masahiro Yamada <yamada.masahiro@socionext.com>

Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -485,7 +485,7 @@ ifneq ($(KBUILD_SRC),)
		$(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile $(srctree)
		endif

		ifeq ($(cc-name),clang)
		ifneq ($(shell $(CC) --version 2>&1 \| head -n 1 \| grep clang),)
		ifneq ($(CROSS_COMPILE),)
		CLANG_TARGET := --target=$(notdir $(CROSS_COMPILE:%-=%))
		GCC_TOOLCHAIN_DIR := $(dir $(shell which $(LD)))

scripts/Kbuild.include

+0 −4

Original line number	Diff line number	Diff line
		@@ -140,10 +140,6 @@ cc-option-yn = $(call try-run,\
		cc-disable-warning = $(call try-run,\
		$(CC) -Werror $(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS) -W$(strip $(1)) -c -x c /dev/null -o "$$TMP",-Wno-$(strip $(1)))

		# cc-name
		# Expands to either gcc or clang
		cc-name = $(shell $(CC) -v 2>&1 \| grep -q "clang version" && echo clang \|\| echo gcc)

		# cc-version
		cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CC))

Admin message