On Mon, Jan 09, 2023 at 03:14:36PM +0900, Masahiro Yamada wrote: > 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@xxxxxxxxxx> > Reviewed-by: Miguel Ojeda <ojeda@xxxxxxxxxx> > Tested-by: Miguel Ojeda <ojeda@xxxxxxxxxx> Reviewed-by: Nathan Chancellor <nathan@xxxxxxxxxx> > --- > > 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)=rust > endif > > @@ -1813,7 +1813,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 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). > > 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 > -- > 2.34.1 >
