From patchwork Tue Oct 30 04:21:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 149692 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp4976447ljp; Mon, 29 Oct 2018 21:22:00 -0700 (PDT) X-Google-Smtp-Source: AJdET5cw11j3iemJalicQHua0WfKtrJCsWFWgCfmuduaJksDUgOt/YTWlsd7QfJ9cmh/VN7W8+XM X-Received: by 2002:a65:4783:: with SMTP id e3-v6mr16193842pgs.12.1540873320791; Mon, 29 Oct 2018 21:22:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540873320; cv=none; d=google.com; s=arc-20160816; b=nbQBhhGn8+FC0hchdAW8PDz1Z2bt8Mzm/63mCrDLo4kfhrheJN/aXI0XyFEVRDAEew fbE3Ep3KrGztJ5fYJlKgPPKFYtxU6MomcDyVyk4ojNWA9sq4VVSq62X5p7IZiveTNHIA 5Nuoel9bu+qtMPI9heF8P8Q6QaSAl9iDjRUU6NjMAiq4wu/3Qv1rdA3CzPQgcZ7HEQDb vhzluwpHaI4d2FK18FxIRflK7bT9KT6iwmmtEMgzdlReZBAy9s7Wip/Vi0L+HsCE8zSU RuHx96eVKYmch3rPiuQaY2NoVcgMQamtQFHicrnr2v8MPWhhZuHuYTIWpbuCfCkxbO46 sYXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=vok3clh1+AcMHEIx5gsB0OBiQpXmww8S1/r1ejlge/g=; b=AxrQIUncvcmqTB49f2dOSTr6f2y8q4QEtB46xkvlLEGvi6bicFUDMUHcrG4opGK3wp KfKAQFXw7Dq1/gFSYXnu8eKgYHRTiaPZIk9Jl3c9NEYWHGmdJP9CbnA4bIp9tBKwd6EB byuoaoKpQeQo28rp7qe5tmhkfp2PHrppxqdQDTl16GbLc0uZ+yedkeT5LAkmNU/59oG3 UJR0mwr5XiFPVPgPiqh6Q0Q1zKRWmQihpXi/+4n3enYc7SaUPzvwdEpeqrVK6TrtWpKn zptMDhuZqmjfy0Zaj9n4mHhbiwf/i5W8WMz5yLYaK2KxLIRrZJTe1JUxJl/SPeN69uR6 B1rQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=hqzboSOg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 65-v6si20600151pfl.220.2018.10.29.21.21.58; Mon, 29 Oct 2018 21:22:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=hqzboSOg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726108AbeJ3NNo (ORCPT + 32 others); Tue, 30 Oct 2018 09:13:44 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:33569 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725971AbeJ3NNo (ORCPT ); Tue, 30 Oct 2018 09:13:44 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id w9U4LgZL000764; Tue, 30 Oct 2018 13:21:43 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com w9U4LgZL000764 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1540873303; bh=vok3clh1+AcMHEIx5gsB0OBiQpXmww8S1/r1ejlge/g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hqzboSOgvlGLlHrDxCF879w0FQ1OFDmdzF1JKCpMFslFuQ/dh3uJOmOqiKF+clWun +NRttbUcp1ACWTaJGy82Vv+b39zhxgKi6CSk7dOjEb+RAMQmcu6uAV7X0mq8ksBCS9 3sT9s23GKdjfdLfnxorRD/RY4ZyUmw99YFRf8j9rd6Ad46dmpe+gUVd8Ru16LPNB58 HTd/zYrRQU/3KK4jF/A6JUTf4+5fjx8MxSqmcTdfPgfTccmut6a61qEnyatZm9UJvO ahvGIM3fAqnZC4Yu8OfYNLomXnBI5fjWul4QiBjHZ8nOyF9mjvYVAqBOl26PkfHWbX g0cw4ITBNK6YA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] kbuild: remove cc-name variable Date: Tue, 30 Oct 2018 13:21:33 +0900 Message-Id: <1540873293-29817-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1540873293-29817-1-git-send-email-yamada.masahiro@socionext.com> References: <1540873293-29817-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- Makefile | 2 +- scripts/Kbuild.include | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) -- 2.7.4 diff --git a/Makefile b/Makefile index bd93bc3..430f7de 100644 --- a/Makefile +++ b/Makefile @@ -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 ca21a35..51703ae 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))