kbuild: rust_is_available: remove -v option

[ Upstream commit d824d2f98565e7c4cb1b862c230198fbe1a968be ]

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 <masahiroy@kernel.org>
Reviewed-by: Miguel Ojeda <ojeda@kernel.org>
Tested-by: Miguel Ojeda <ojeda@kernel.org>
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
Link: https://lore.kernel.org/r/20230109061436.3146442-1-masahiroy@kernel.org
[ Reworded prefix to match the others in the patch series. ]
Reviewed-by: Martin Rodriguez Reboredo <yakoyoku@gmail.com>
Link: https://lore.kernel.org/r/20230616001631.463536-2-ojeda@kernel.org
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
Stable-dep-of: dee3a6b819c9 ("kbuild: rust_is_available: fix version check when CC has multiple arguments")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/Makefile b/Makefile
index 82aaa3a..c627e0b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1291,7 +1291,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)=rust
 endif
 
@@ -1817,7 +1817,7 @@ $(DOC_TARGETS):
 # "Is Rust available?" target
 PHONY += rustavailable
 rustavailable:
-       $(Q)$(CONFIG_SHELL) $(srctree)/scripts/rust_is_available.sh -v && echo "Rust is available!"
+       $(Q)$(CONFIG_SHELL) $(srctree)/scripts/rust_is_available.sh && echo "Rust is available!"
 
 # Documentation target
 #

diff --git a/scripts/rust_is_available.sh b/scripts/rust_is_available.sh
index aebbf19..f43a010 100755 (executable)
--- 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).
 
 set -e
 
@@ -23,21 +21,17 @@ get_canonical_version()
 
 # Check that the Rust compiler exists.
 if ! command -v "$RUSTC" >/dev/null; then
-       if [ "$1" = -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
 
 # Check that the Rust bindings generator exists.
 if ! command -v "$BINDGEN" >/dev/null; then
-       if [ "$1" = -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
 
@@ -53,16 +47,14 @@ rust_compiler_min_version=$($min_tool_version rustc)
 rust_compiler_cversion=$(get_canonical_version $rust_compiler_version)
 rust_compiler_min_cversion=$(get_canonical_version $rust_compiler_min_version)
 if [ "$rust_compiler_cversion" -lt "$rust_compiler_min_cversion" ]; then
-       if [ "$1" = -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" = -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=$($min_tool_version bindgen)
 rust_bindings_generator_cversion=$(get_canonical_version $rust_bindings_generator_version)
 rust_bindings_generator_min_cversion=$(get_canonical_version $rust_bindings_generator_min_version)
 if [ "$rust_bindings_generator_cversion" -lt "$rust_bindings_generator_min_cversion" ]; then
-       if [ "$1" = -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" = -v ] && [ "$rust_bindings_generator_cversion" -gt "$rust_bindings_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=$($min_tool_version llvm)
 bindgen_libclang_cversion=$(get_canonical_version $bindgen_libclang_version)
 bindgen_libclang_min_cversion=$(get_canonical_version $bindgen_libclang_min_version)
 if [ "$bindgen_libclang_cversion" -lt "$bindgen_libclang_min_cversion" ]; then
-       if [ "$1" = -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') is too old."
+       echo >&2 "***   Your version:    $bindgen_libclang_version"
+       echo >&2 "***   Minimum version: $bindgen_libclang_min_version"
+       echo >&2 "***"
        exit 1
 fi
 
@@ -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" = -v ]; then
-       cc_name=$($(dirname $0)/cc-version.sh "$CC" | cut -f1 -d' ')
-       if [ "$cc_name" = Clang ]; then
-               clang_version=$( \
-                       LC_ALL=C "$CC" --version 2>/dev/null \
-                               | sed -nE '1s:.*version ([0-9]+\.[0-9]+\.[0-9]+).*:\1:p'
-               )
-               if [ "$clang_version" != "$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=$($(dirname $0)/cc-version.sh "$CC" | cut -f1 -d' ')
+if [ "$cc_name" = Clang ]; then
+       clang_version=$( \
+               LC_ALL=C "$CC" --version 2>/dev/null \
+                       | sed -nE '1s:.*version ([0-9]+\.[0-9]+\.[0-9]+).*:\1:p'
+       )
+       if [ "$clang_version" != "$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
 
@@ -150,11 +136,9 @@ rustc_sysroot=$("$RUSTC" $KRUSTFLAGS --print sysroot)
 rustc_src=${RUST_LIB_SRC:-"$rustc_sysroot/lib/rustlib/src/rust/library"}
 rustc_src_core="$rustc_src/core/src/lib.rs"
 if [ ! -e "$rustc_src_core" ]; then
-       if [ "$1" = -v ]; then
-               echo >&2 "***"
-               echo >&2 "*** Source code for the 'core' standard library could not be found"
-               echo >&2 "*** at '$rustc_src_core'."
-               echo >&2 "***"
-       fi
+       echo >&2 "***"
+       echo >&2 "*** Source code for the 'core' standard library could not be found"
+       echo >&2 "*** at '$rustc_src_core'."
+       echo >&2 "***"
        exit 1
 fi