From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0F4CCC43381 for ; Tue, 9 Mar 2021 16:27:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D5C9A65238 for ; Tue, 9 Mar 2021 16:27:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230525AbhCIQ0g (ORCPT ); Tue, 9 Mar 2021 11:26:36 -0500 Received: from conuserg-09.nifty.com ([210.131.2.76]:47157 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230421AbhCIQ03 (ORCPT ); Tue, 9 Mar 2021 11:26:29 -0500 Received: from localhost.localdomain (133-32-232-101.west.xps.vectant.ne.jp [133.32.232.101]) (authenticated) by conuserg-09.nifty.com with ESMTP id 129GPmqj014156; Wed, 10 Mar 2021 01:25:48 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com 129GPmqj014156 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1615307149; bh=EhPEE3oHKhL3vmJHIpnrH/DrMpFTrrE0NYQj/7BwJD0=; h=From:To:Cc:Subject:Date:From; b=Eg1tKjTpG8j5yvqd2Yse5TOe8sMmOVB2em+wI0mYKUtpw0nmZiBW+p+DsVXzHmEb8 +KZeZw1m6kA7VI0OJJk1ZyGbOTJXIRpPfhijDUC90h+v7N92bsk/ZFtcHg7IwwC0dT TsriLGsQDBdTrmVWDslGO3szJlix5p6jSMzTSOrX9Rtf+ckYoMMveWx/PmmBOqHwM/ vH0bBVfQ8Ul7AZnBBRmNZXmJ5AamEmSjlWVJf3bJ6gYASmL3MFGCJ1Ssw1MZbTnylz wBdFFtqAestmTe3pMxhPXbPOFW1lBukyVg/jYss518qBK1B8xbNHbcOmahvdvWtmX0 JQsh86ZlhiK1Q== X-Nifty-SrcIP: [133.32.232.101] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Jiri Slaby , Masahiro Yamada , Jiri Slaby , Miguel Ojeda , Nathan Chancellor , Nick Desaulniers , Philipp Rudo , linux-kernel@vger.kernel.org Subject: [PATCH] kbuild: dummy-tools: adjust to scripts/cc-version.sh Date: Wed, 10 Mar 2021 01:25:45 +0900 Message-Id: <20210309162545.637647-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit aec6c60a01d3 ("kbuild: check the minimum compiler version in Kconfig") changed how the script detects the compiler version. Get 'make CROSS_COMPILE=scripts/dummy-tools/' back working again. Fixes: aec6c60a01d3 ("kbuild: check the minimum compiler version in Kconfig") Signed-off-by: Masahiro Yamada --- Perhaps, Jiri may have already noticed this issue, and have a similar patch. I just checked ML, but I did not find a patch to fix this. scripts/dummy-tools/gcc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/dummy-tools/gcc b/scripts/dummy-tools/gcc index 7b10332b23ba..39e65fee59bd 100755 --- a/scripts/dummy-tools/gcc +++ b/scripts/dummy-tools/gcc @@ -57,9 +57,9 @@ if arg_contain --version "$@"; then fi if arg_contain -E "$@"; then - # For scripts/gcc-version.sh; This emulates GCC 20.0.0 + # For scripts/cc-version.sh; This emulates GCC 20.0.0 if arg_contain - "$@"; then - sed 's/^__GNUC__$/20/; s/^__GNUC_MINOR__$/0/; s/^__GNUC_PATCHLEVEL__$/0/' + sed -n '/^GCC/{s/__GNUC__/20/; s/__GNUC_MINOR__/0/; s/__GNUC_PATCHLEVEL__/0/; p;}' exit 0 else echo "no input files" >&2 -- 2.27.0