diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-10-30 22:26:34 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-11-02 22:49:01 +0900 |
| commit | 995167420797c000bff1f0787ab2390ffa1a9784 (patch) | |
| tree | 87f32e8f182cbbb354ff1fb91ec439fe0d578e03 | |
| parent | 076f421da5d4594d0a3e60c032ccf02ba55e868a (diff) | |
| download | linux-stable-995167420797c000bff1f0787ab2390ffa1a9784.tar.gz linux-stable-995167420797c000bff1f0787ab2390ffa1a9784.tar.bz2 linux-stable-995167420797c000bff1f0787ab2390ffa1a9784.zip | |
kbuild: remove cc-name variable
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>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | scripts/Kbuild.include | 4 |
2 files changed, 1 insertions, 5 deletions
@@ -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))) diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index 19a63db62fb9..bb015551c2d9 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include @@ -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)) |