From nobody Tue Sep 16 02:17:14 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7EA62C54EBD for ; Mon, 9 Jan 2023 06:14:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233618AbjAIGOz (ORCPT ); Mon, 9 Jan 2023 01:14:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230458AbjAIGOv (ORCPT ); Mon, 9 Jan 2023 01:14:51 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4CFB210FCE; Sun, 8 Jan 2023 22:14:50 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 72D90CE0B65; Mon, 9 Jan 2023 06:14:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 63D20C433D2; Mon, 9 Jan 2023 06:14:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673244886; bh=7nHdG7tBKvymlwJ/oQJ88KCANE4outKDYx5LGQcv3bU=; h=From:To:Cc:Subject:Date:From; b=Tp16WlcPkwuxR20sEg9VspajpL7aDjyHuBtjsr8UuQ2FbIdOUo7/Y0hx4+g1xBzzG +qaP7L6BgkPjPzd14wBgl8v1asbWAsk8BWUSEB0S0DyjjSKGVHPphh++wJxiczBYvE xLqpsLNuWdhuqtOObOFIEqKNeB1Xj4dp0pxPuY50Ybz0Lmp7ie88BoAZ5hsY6p32x6 l7WIf1xWTiP35pUVsOzD5hyCHviqYMFTon6TJLHVDzD7+zc+dbSKbx77IlHn7E0q6I PnIwOeDmqYiCdG4yCOldKCusQ5jhg8hYZ6oW8C1ZWrHEkJT6nApL1tONWNXCUgzZyF MLqWvIYzRtMmA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , Miguel Ojeda , Alex Gaynor , =?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?= , Boqun Feng , Gary Guo , Nathan Chancellor , Nick Desaulniers , Nicolas Schier , Tom Rix , Wedson Almeida Filho , llvm@lists.linux.dev, rust-for-linux@vger.kernel.org Subject: [PATCH v2] kbuild: rust: remove -v option of scripts/rust_is_available.sh Date: Mon, 9 Jan 2023 15:14:36 +0900 Message-Id: <20230109061436.3146442-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The -v option is passed when this script is invoked from Makefile, but not when invoked from Kconfig. As you can see in scripts/Kconfig.include, the 'success' macro suppresses stdout and stderr anyway, so this script does not need to be quiet. Signed-off-by: Masahiro Yamada Reviewed-by: Miguel Ojeda Tested-by: Miguel Ojeda Reviewed-by: Nathan Chancellor --- Changes in v2: - Fix description (scripts -> script) - Remove stale comment Makefile | 4 +- scripts/rust_is_available.sh | 96 +++++++++++++++--------------------- 2 files changed, 42 insertions(+), 58 deletions(-) diff --git a/Makefile b/Makefile index c1f59f54ae90..59d827b85888 100644 --- a/Makefile +++ b/Makefile @@ -1288,7 +1288,7 @@ prepare0: archprepare # All the preparing.. prepare: prepare0 ifdef CONFIG_RUST - $(Q)$(CONFIG_SHELL) $(srctree)/scripts/rust_is_available.sh -v + $(Q)$(CONFIG_SHELL) $(srctree)/scripts/rust_is_available.sh $(Q)$(MAKE) $(build)=3Drust endif =20 @@ -1813,7 +1813,7 @@ $(DOC_TARGETS): # "Is Rust available?" target PHONY +=3D rustavailable rustavailable: - $(Q)$(CONFIG_SHELL) $(srctree)/scripts/rust_is_available.sh -v && echo "R= ust is available!" + $(Q)$(CONFIG_SHELL) $(srctree)/scripts/rust_is_available.sh && echo "Rust= is available!" =20 # Documentation target # diff --git a/scripts/rust_is_available.sh b/scripts/rust_is_available.sh index aebbf1913970..f43a010eaf30 100755 --- a/scripts/rust_is_available.sh +++ b/scripts/rust_is_available.sh @@ -2,8 +2,6 @@ # SPDX-License-Identifier: GPL-2.0 # # Tests whether a suitable Rust toolchain is available. -# -# Pass `-v` for human output and more checks (as warnings). =20 set -e =20 @@ -23,21 +21,17 @@ get_canonical_version() =20 # Check that the Rust compiler exists. if ! command -v "$RUSTC" >/dev/null; then - if [ "$1" =3D -v ]; then - echo >&2 "***" - echo >&2 "*** Rust compiler '$RUSTC' could not be found." - echo >&2 "***" - fi + echo >&2 "***" + echo >&2 "*** Rust compiler '$RUSTC' could not be found." + echo >&2 "***" exit 1 fi =20 # Check that the Rust bindings generator exists. if ! command -v "$BINDGEN" >/dev/null; then - if [ "$1" =3D -v ]; then - echo >&2 "***" - echo >&2 "*** Rust bindings generator '$BINDGEN' could not be found." - echo >&2 "***" - fi + echo >&2 "***" + echo >&2 "*** Rust bindings generator '$BINDGEN' could not be found." + echo >&2 "***" exit 1 fi =20 @@ -53,16 +47,14 @@ rust_compiler_min_version=3D$($min_tool_version rustc) rust_compiler_cversion=3D$(get_canonical_version $rust_compiler_version) rust_compiler_min_cversion=3D$(get_canonical_version $rust_compiler_min_ve= rsion) if [ "$rust_compiler_cversion" -lt "$rust_compiler_min_cversion" ]; then - if [ "$1" =3D -v ]; then - echo >&2 "***" - echo >&2 "*** Rust compiler '$RUSTC' is too old." - echo >&2 "*** Your version: $rust_compiler_version" - echo >&2 "*** Minimum version: $rust_compiler_min_version" - echo >&2 "***" - fi + echo >&2 "***" + echo >&2 "*** Rust compiler '$RUSTC' is too old." + echo >&2 "*** Your version: $rust_compiler_version" + echo >&2 "*** Minimum version: $rust_compiler_min_version" + echo >&2 "***" exit 1 fi -if [ "$1" =3D -v ] && [ "$rust_compiler_cversion" -gt "$rust_compiler_min_= cversion" ]; then +if [ "$rust_compiler_cversion" -gt "$rust_compiler_min_cversion" ]; then echo >&2 "***" echo >&2 "*** Rust compiler '$RUSTC' is too new. This may or may not work= ." echo >&2 "*** Your version: $rust_compiler_version" @@ -82,16 +74,14 @@ rust_bindings_generator_min_version=3D$($min_tool_versi= on bindgen) rust_bindings_generator_cversion=3D$(get_canonical_version $rust_bindings_= generator_version) rust_bindings_generator_min_cversion=3D$(get_canonical_version $rust_bindi= ngs_generator_min_version) if [ "$rust_bindings_generator_cversion" -lt "$rust_bindings_generator_min= _cversion" ]; then - if [ "$1" =3D -v ]; then - echo >&2 "***" - echo >&2 "*** Rust bindings generator '$BINDGEN' is too old." - echo >&2 "*** Your version: $rust_bindings_generator_version" - echo >&2 "*** Minimum version: $rust_bindings_generator_min_version" - echo >&2 "***" - fi + echo >&2 "***" + echo >&2 "*** Rust bindings generator '$BINDGEN' is too old." + echo >&2 "*** Your version: $rust_bindings_generator_version" + echo >&2 "*** Minimum version: $rust_bindings_generator_min_version" + echo >&2 "***" exit 1 fi -if [ "$1" =3D -v ] && [ "$rust_bindings_generator_cversion" -gt "$rust_bin= dings_generator_min_cversion" ]; then +if [ "$rust_bindings_generator_cversion" -gt "$rust_bindings_generator_min= _cversion" ]; then echo >&2 "***" echo >&2 "*** Rust bindings generator '$BINDGEN' is too new. This may or = may not work." echo >&2 "*** Your version: $rust_bindings_generator_version" @@ -110,13 +100,11 @@ bindgen_libclang_min_version=3D$($min_tool_version ll= vm) bindgen_libclang_cversion=3D$(get_canonical_version $bindgen_libclang_vers= ion) bindgen_libclang_min_cversion=3D$(get_canonical_version $bindgen_libclang_= min_version) if [ "$bindgen_libclang_cversion" -lt "$bindgen_libclang_min_cversion" ]; = then - if [ "$1" =3D -v ]; then - echo >&2 "***" - echo >&2 "*** libclang (used by the Rust bindings generator '$BINDGEN') = is too old." - echo >&2 "*** Your version: $bindgen_libclang_version" - echo >&2 "*** Minimum version: $bindgen_libclang_min_version" - echo >&2 "***" - fi + echo >&2 "***" + echo >&2 "*** libclang (used by the Rust bindings generator '$BINDGEN') i= s too old." + echo >&2 "*** Your version: $bindgen_libclang_version" + echo >&2 "*** Minimum version: $bindgen_libclang_min_version" + echo >&2 "***" exit 1 fi =20 @@ -125,21 +113,19 @@ fi # # In the future, we might be able to perform a full version check, see # https://github.com/rust-lang/rust-bindgen/issues/2138. -if [ "$1" =3D -v ]; then - cc_name=3D$($(dirname $0)/cc-version.sh "$CC" | cut -f1 -d' ') - if [ "$cc_name" =3D Clang ]; then - clang_version=3D$( \ - LC_ALL=3DC "$CC" --version 2>/dev/null \ - | sed -nE '1s:.*version ([0-9]+\.[0-9]+\.[0-9]+).*:\1:p' - ) - if [ "$clang_version" !=3D "$bindgen_libclang_version" ]; then - echo >&2 "***" - echo >&2 "*** libclang (used by the Rust bindings generator '$BINDGEN')" - echo >&2 "*** version does not match Clang's. This may be a problem." - echo >&2 "*** libclang version: $bindgen_libclang_version" - echo >&2 "*** Clang version: $clang_version" - echo >&2 "***" - fi +cc_name=3D$($(dirname $0)/cc-version.sh "$CC" | cut -f1 -d' ') +if [ "$cc_name" =3D Clang ]; then + clang_version=3D$( \ + LC_ALL=3DC "$CC" --version 2>/dev/null \ + | sed -nE '1s:.*version ([0-9]+\.[0-9]+\.[0-9]+).*:\1:p' + ) + if [ "$clang_version" !=3D "$bindgen_libclang_version" ]; then + echo >&2 "***" + echo >&2 "*** libclang (used by the Rust bindings generator '$BINDGEN')" + echo >&2 "*** version does not match Clang's. This may be a problem." + echo >&2 "*** libclang version: $bindgen_libclang_version" + echo >&2 "*** Clang version: $clang_version" + echo >&2 "***" fi fi =20 @@ -150,11 +136,9 @@ rustc_sysroot=3D$("$RUSTC" $KRUSTFLAGS --print sysroot) rustc_src=3D${RUST_LIB_SRC:-"$rustc_sysroot/lib/rustlib/src/rust/library"} rustc_src_core=3D"$rustc_src/core/src/lib.rs" if [ ! -e "$rustc_src_core" ]; then - if [ "$1" =3D -v ]; then - echo >&2 "***" - echo >&2 "*** Source code for the 'core' standard library could not be f= ound" - echo >&2 "*** at '$rustc_src_core'." - echo >&2 "***" - fi + echo >&2 "***" + echo >&2 "*** Source code for the 'core' standard library could not be fo= und" + echo >&2 "*** at '$rustc_src_core'." + echo >&2 "***" exit 1 fi --=20 2.34.1