Message ID | 20230109204520.539080-3-ojeda@kernel.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2372139wrt; Mon, 9 Jan 2023 12:48:21 -0800 (PST) X-Google-Smtp-Source: AMrXdXsqEIfQ9YJcFWq7QIlbcrSHlOkQ98SXHzbyaLPJf0KYQcnRaVBv3zAWby6YB2kkA1Ugps6s X-Received: by 2002:a17:906:f6c5:b0:7c1:8704:80c4 with SMTP id jo5-20020a170906f6c500b007c1870480c4mr56626578ejb.47.1673297300851; Mon, 09 Jan 2023 12:48:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673297300; cv=none; d=google.com; s=arc-20160816; b=b79w7yMLaI3osWmMED38xHmzizJsKPeasRAjRpUGrIUVLMIOEqF3NsiBzxvgyQmeqx nmqGiUFSMX74KrMQhQ4uo8wS/ZJM7lVv3TJNoDvmmYwd0qhmj0V1wQRQQkdL/GN+eR5d iom+17aFcJVtDkeRCMFfcnBVWO01s715l9hu68+JibucPzYnjpD4G3NEoymLSP9MfBJm vMhE/bWHSMY8Ubz3TFRDbSC8g/zwwMt88Byhc/i4yXKLvIhy/b5MGCWCTX3ENjEFQNAs GLf5baYe4Qxu1oq8rO5IVm/HaFjAhOwghOEDaZC3H9xlhJZn6rxSZKjDuEbHJUM8cd9l iv6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ExgRow/fXtjzY4/sNs/xJc5DpTg7hISFra+/jeyvc9Y=; b=M7ypTNIoXe2DucfA/vXk+jHyLljiyH9055QjTRCg55OWzfd0S3arHQrDdVSB14Vtnx 3vklAMuD4khA8WtD2+961N7Zcabtg21D9BjDmV2rW4R/dQPY6IOm9jeIcLC19U7vvwTC 6xH+Br021X90AilyMxYVMsajpEuLNmejxZ+CsbrxAgZGezavTmXZsPxmfws/paakRWCd GKgAnuzPDt+Q25h45wNgi+rxJ3s9wsWWMgzFdUSK9AXUGuiv3avL2ngCgD32BRFGiwAt mSLYPXf2SqGSTfliw8s8KkVdd87lGRsLmWX7wEdvZDp8e8OyRL99fafV6vyGo7vvdjhz SSQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Xu9XkvS2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hw19-20020a170907a0d300b007c0f7afccccsi7798831ejc.696.2023.01.09.12.47.56; Mon, 09 Jan 2023 12:48:20 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Xu9XkvS2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237345AbjAIUqT (ORCPT <rfc822;syz17693488234@gmail.com> + 99 others); Mon, 9 Jan 2023 15:46:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55400 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237556AbjAIUqB (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 9 Jan 2023 15:46:01 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36C063D5D0; Mon, 9 Jan 2023 12:45:58 -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 ams.source.kernel.org (Postfix) with ESMTPS id 5ACEDB80FE1; Mon, 9 Jan 2023 20:45:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 04D07C433F2; Mon, 9 Jan 2023 20:45:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673297156; bh=/mRvhEXfYmI5Ul0O7z4JhnCdPQzvBa89XuNNnjPrSOQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Xu9XkvS2/GRUYf6ySXBmXi7SSOMyJmp6WOLOctFABGxpIVubOVckX8L6SYSrWSn4N 7MyXNjiO1/ywsAsw98zUeh+3JBPlUlxbtx+Iv0wl0NFwsbrPNYBZ+VCqXqSoWMA1FO LlFggKuclGea/ZnE4ZkoXL+lRf2xl6H24GXw5Byv0KH2tIQQ8p+I+JMLIWoWmbQu2v WWSlSrQlCrfsAvyOnopxDa6qddozWas+Ki2iFQessU5RUvPKwyQvKurqtvK59HE9j7 Ldrv83+dNi5sziZL6B/I8Tdy+cTSzQTat0lJl97wYUNpZ8O7vrpZxURqMcADGuX0N4 5UQgwR4TQGE9w== From: Miguel Ojeda <ojeda@kernel.org> To: Masahiro Yamada <masahiroy@kernel.org> Cc: linux-kbuild@vger.kernel.org, Nathan Chancellor <nathan@kernel.org>, Nick Desaulniers <ndesaulniers@google.com>, Nicolas Schier <nicolas@fjasle.eu>, rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Miguel Ojeda <ojeda@kernel.org>, Alexandru Radovici <msg4alex@gmail.com>, Alex Gaynor <alex.gaynor@gmail.com>, Wedson Almeida Filho <wedsonaf@gmail.com>, Boqun Feng <boqun.feng@gmail.com>, Gary Guo <gary@garyguo.net>, =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= <bjorn3_gh@protonmail.com> Subject: [PATCH 3/6] kbuild: rust_is_available: add check for `bindgen` invocation Date: Mon, 9 Jan 2023 21:45:17 +0100 Message-Id: <20230109204520.539080-3-ojeda@kernel.org> In-Reply-To: <20230109204520.539080-1-ojeda@kernel.org> References: <20230109204520.539080-1-ojeda@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754579390388707957?= X-GMAIL-MSGID: =?utf-8?q?1754579390388707957?= |
Series |
[1/6] docs: rust: add paragraph about finding a suitable `libclang`
|
|
Commit Message
Miguel Ojeda
Jan. 9, 2023, 8:45 p.m. UTC
`scripts/rust_is_available.sh` calls `bindgen` with a special
header in order to check whether the `libclang` version in use
is suitable.
However, the invocation itself may fail if, for instance, `bindgen`
cannot locate `libclang`. This is fine for Kconfig (since the
script will still fail and therefore disable Rust as it should),
but it is pretty confusing for users of the `rustavailable` target
given the error will be unrelated:
./scripts/rust_is_available.sh: 21: arithmetic expression: expecting primary: "100000 * + 100 * + "
make: *** [Makefile:1816: rustavailable] Error 2
Instead, run the `bindgen` invocation independently in a previous
step, saving its output and return code. If it fails, then show
the user a proper error message. Otherwise, continue as usual
with the saved output.
Since the previous patch we show a reference to the docs, and
the docs now explain how `bindgen` looks for `libclang`,
thus the error message can leverage the documentation, avoiding
duplication here (and making users aware of the setup guide in
the documentation).
Reported-by: Nick Desaulniers <ndesaulniers@google.com>
Reported-by: fvalenduc (@fvalenduc)
Reported-by: Alexandru Radovici <msg4alex@gmail.com>
Link: https://lore.kernel.org/rust-for-linux/CAKwvOdm5JT4wbdQQYuW+RT07rCi6whGBM2iUAyg8A1CmLXG6Nw@mail.gmail.com/
Link: https://github.com/Rust-for-Linux/linux/issues/934
Link: https://github.com/Rust-for-Linux/linux/pull/921
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
---
scripts/rust_is_available.sh | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
Comments
On Mon, Jan 09, 2023 at 09:45:17PM +0100, Miguel Ojeda wrote: > `scripts/rust_is_available.sh` calls `bindgen` with a special > header in order to check whether the `libclang` version in use > is suitable. > > However, the invocation itself may fail if, for instance, `bindgen` > cannot locate `libclang`. This is fine for Kconfig (since the > script will still fail and therefore disable Rust as it should), > but it is pretty confusing for users of the `rustavailable` target > given the error will be unrelated: > > ./scripts/rust_is_available.sh: 21: arithmetic expression: expecting primary: "100000 * + 100 * + " > make: *** [Makefile:1816: rustavailable] Error 2 > > Instead, run the `bindgen` invocation independently in a previous > step, saving its output and return code. If it fails, then show > the user a proper error message. Otherwise, continue as usual > with the saved output. > > Since the previous patch we show a reference to the docs, and > the docs now explain how `bindgen` looks for `libclang`, > thus the error message can leverage the documentation, avoiding > duplication here (and making users aware of the setup guide in > the documentation). > > Reported-by: Nick Desaulniers <ndesaulniers@google.com> > Reported-by: fvalenduc (@fvalenduc) Per Documentation/process/maintainer-tip.rst, the "Reported-by" tag does require "Name <mailaddress>" format. Given we already have the GitHub issue link, I wonder whether it's better we ask for the reporter's email address (and real name) for the "Reported-by" field, and if they prefer to not providing one, we just don't use the "Reported-by" tag since we still have the GitHub issue link for their contribution. Thoughts? Regards, Boqun > Reported-by: Alexandru Radovici <msg4alex@gmail.com> > Link: https://lore.kernel.org/rust-for-linux/CAKwvOdm5JT4wbdQQYuW+RT07rCi6whGBM2iUAyg8A1CmLXG6Nw@mail.gmail.com/ > Link: https://github.com/Rust-for-Linux/linux/issues/934 > Link: https://github.com/Rust-for-Linux/linux/pull/921 > Signed-off-by: Miguel Ojeda <ojeda@kernel.org> > --- > scripts/rust_is_available.sh | 23 ++++++++++++++++++++++- > 1 file changed, 22 insertions(+), 1 deletion(-) > > diff --git a/scripts/rust_is_available.sh b/scripts/rust_is_available.sh > index c907cf881c2c..cd87729ca3bf 100755 > --- a/scripts/rust_is_available.sh > +++ b/scripts/rust_is_available.sh > @@ -108,8 +108,29 @@ if [ "$rust_bindings_generator_cversion" -gt "$rust_bindings_generator_min_cvers > fi > > # Check that the `libclang` used by the Rust bindings generator is suitable. > +# > +# In order to do that, first invoke `bindgen` to get the `libclang` version > +# found by `bindgen`. This step may already fail if, for instance, `libclang` > +# is not found, thus inform the user in such a case. > +set +e > +bindgen_libclang_output=$(LC_ALL=C "$BINDGEN" $(dirname $0)/rust_is_available_bindgen_libclang.h 2>&1 >/dev/null) > +bindgen_libclang_code=$? > +set -e > +if [ $bindgen_libclang_code -ne 0 ]; then > + echo >&2 "***" > + echo >&2 "*** Running '$BINDGEN' to check the libclang version (used by the Rust" > + echo >&2 "*** bindings generator) failed with code $bindgen_libclang_code. This may be caused by" > + echo >&2 "*** a failure to locate libclang. See output and docs below for details:" > + echo >&2 "***" > + echo >&2 "$bindgen_libclang_output" > + echo >&2 "***" > + exit 1 > +fi > + > +# `bindgen` returned successfully, thus use the output to check that the version > +# of the `libclang` found by the Rust bindings generator is suitable. > bindgen_libclang_version=$( \ > - LC_ALL=C "$BINDGEN" $(dirname $0)/rust_is_available_bindgen_libclang.h 2>&1 >/dev/null \ > + echo "$bindgen_libclang_output" \ > | grep -F 'clang version ' \ > | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' \ > | head -n 1 \ > -- > 2.39.0 >
On Mon, Jan 9, 2023 at 11:47 PM Boqun Feng <boqun.feng@gmail.com> wrote: > > Per Documentation/process/maintainer-tip.rst, the "Reported-by" tag does > require "Name <mailaddress>" format. Given we already have the GitHub > issue link, I wonder whether it's better we ask for the reporter's > email address (and real name) for the "Reported-by" field, and if they > prefer to not providing one, we just don't use the "Reported-by" tag > since we still have the GitHub issue link for their contribution. > > Thoughts? As far as I understand, that is for the tip tree (though `checkpatch.pl` complained too), and I am not sure in that guide they intend it to mean it is the only form accepted. In this case, I ended up deciding to add it since it was not a Signed-off-by/Reviewed-by/Acked-by (so not as critical, i.e. no DCO/RSO/...) and there are quite a few other instances, including different CIs and tools, raw emails, security teams, etc. So it doesn't look like it is required to be a "real name" like some of the other tags, and sometimes we may need to do otherwise anyway (for those cases), and I guess we don't want to discourage reports too much. Perhaps we can, at least, ask for an email address -- that is way more common in the log, and gives us a potential way to contact people and send the patches to. In any case, I agree we should prefer the "real name" way as much as possible. I had sent a message to each GitHub issue/PR linking back to the patches, but I will send another to offer them to use their real name if they prefer. Thanks for taking a look! :) Cheers, Miguel
On Tue, Jan 10, 2023 at 5:45 AM Miguel Ojeda <ojeda@kernel.org> wrote: > > `scripts/rust_is_available.sh` calls `bindgen` with a special > header in order to check whether the `libclang` version in use > is suitable. > > However, the invocation itself may fail if, for instance, `bindgen` > cannot locate `libclang`. This is fine for Kconfig (since the > script will still fail and therefore disable Rust as it should), > but it is pretty confusing for users of the `rustavailable` target > given the error will be unrelated: > > ./scripts/rust_is_available.sh: 21: arithmetic expression: expecting primary: "100000 * + 100 * + " > make: *** [Makefile:1816: rustavailable] Error 2 > > Instead, run the `bindgen` invocation independently in a previous > step, saving its output and return code. If it fails, then show > the user a proper error message. Otherwise, continue as usual > with the saved output. > > Since the previous patch we show a reference to the docs, and > the docs now explain how `bindgen` looks for `libclang`, > thus the error message can leverage the documentation, avoiding > duplication here (and making users aware of the setup guide in > the documentation). > > Reported-by: Nick Desaulniers <ndesaulniers@google.com> > Reported-by: fvalenduc (@fvalenduc) > Reported-by: Alexandru Radovici <msg4alex@gmail.com> > Link: https://lore.kernel.org/rust-for-linux/CAKwvOdm5JT4wbdQQYuW+RT07rCi6whGBM2iUAyg8A1CmLXG6Nw@mail.gmail.com/ > Link: https://github.com/Rust-for-Linux/linux/issues/934 > Link: https://github.com/Rust-for-Linux/linux/pull/921 > Signed-off-by: Miguel Ojeda <ojeda@kernel.org> > --- > scripts/rust_is_available.sh | 23 ++++++++++++++++++++++- > 1 file changed, 22 insertions(+), 1 deletion(-) > > diff --git a/scripts/rust_is_available.sh b/scripts/rust_is_available.sh > index c907cf881c2c..cd87729ca3bf 100755 > --- a/scripts/rust_is_available.sh > +++ b/scripts/rust_is_available.sh > @@ -108,8 +108,29 @@ if [ "$rust_bindings_generator_cversion" -gt "$rust_bindings_generator_min_cvers > fi > > # Check that the `libclang` used by the Rust bindings generator is suitable. > +# > +# In order to do that, first invoke `bindgen` to get the `libclang` version > +# found by `bindgen`. This step may already fail if, for instance, `libclang` > +# is not found, thus inform the user in such a case. > +set +e > +bindgen_libclang_output=$(LC_ALL=C "$BINDGEN" $(dirname $0)/rust_is_available_bindgen_libclang.h 2>&1 >/dev/null) > +bindgen_libclang_code=$? > +set -e > +if [ $bindgen_libclang_code -ne 0 ]; then > + echo >&2 "***" > + echo >&2 "*** Running '$BINDGEN' to check the libclang version (used by the Rust" > + echo >&2 "*** bindings generator) failed with code $bindgen_libclang_code. This may be caused by" > + echo >&2 "*** a failure to locate libclang. See output and docs below for details:" > + echo >&2 "***" > + echo >&2 "$bindgen_libclang_output" > + echo >&2 "***" > + exit 1 > +fi > Instead of toggling -e, why don't you write like this? if ! bindgen_libclang_output=$(LC_ALL=C "$BINDGEN" $(dirname $0)/rust_is_available_bindgen_libclang.h 2>&1); then [snip] fi -- Best Regards Masahiro Yamada
On Thu, Jan 12, 2023 at 1:33 PM Masahiro Yamada <masahiroy@kernel.org> wrote: > > On Tue, Jan 10, 2023 at 5:45 AM Miguel Ojeda <ojeda@kernel.org> wrote: > > > > `scripts/rust_is_available.sh` calls `bindgen` with a special > > header in order to check whether the `libclang` version in use > > is suitable. > > > > However, the invocation itself may fail if, for instance, `bindgen` > > cannot locate `libclang`. This is fine for Kconfig (since the > > script will still fail and therefore disable Rust as it should), > > but it is pretty confusing for users of the `rustavailable` target > > given the error will be unrelated: > > > > ./scripts/rust_is_available.sh: 21: arithmetic expression: expecting primary: "100000 * + 100 * + " > > make: *** [Makefile:1816: rustavailable] Error 2 > > > > Instead, run the `bindgen` invocation independently in a previous > > step, saving its output and return code. If it fails, then show > > the user a proper error message. Otherwise, continue as usual > > with the saved output. > > > > Since the previous patch we show a reference to the docs, and > > the docs now explain how `bindgen` looks for `libclang`, > > thus the error message can leverage the documentation, avoiding > > duplication here (and making users aware of the setup guide in > > the documentation). > > > > Reported-by: Nick Desaulniers <ndesaulniers@google.com> > > Reported-by: fvalenduc (@fvalenduc) > > Reported-by: Alexandru Radovici <msg4alex@gmail.com> > > Link: https://lore.kernel.org/rust-for-linux/CAKwvOdm5JT4wbdQQYuW+RT07rCi6whGBM2iUAyg8A1CmLXG6Nw@mail.gmail.com/ > > Link: https://github.com/Rust-for-Linux/linux/issues/934 > > Link: https://github.com/Rust-for-Linux/linux/pull/921 > > Signed-off-by: Miguel Ojeda <ojeda@kernel.org> > > --- > > scripts/rust_is_available.sh | 23 ++++++++++++++++++++++- > > 1 file changed, 22 insertions(+), 1 deletion(-) > > > > diff --git a/scripts/rust_is_available.sh b/scripts/rust_is_available.sh > > index c907cf881c2c..cd87729ca3bf 100755 > > --- a/scripts/rust_is_available.sh > > +++ b/scripts/rust_is_available.sh > > @@ -108,8 +108,29 @@ if [ "$rust_bindings_generator_cversion" -gt "$rust_bindings_generator_min_cvers > > fi > > > > # Check that the `libclang` used by the Rust bindings generator is suitable. > > +# > > +# In order to do that, first invoke `bindgen` to get the `libclang` version > > +# found by `bindgen`. This step may already fail if, for instance, `libclang` > > +# is not found, thus inform the user in such a case. > > +set +e > > +bindgen_libclang_output=$(LC_ALL=C "$BINDGEN" $(dirname $0)/rust_is_available_bindgen_libclang.h 2>&1 >/dev/null) > > +bindgen_libclang_code=$? > > +set -e > > +if [ $bindgen_libclang_code -ne 0 ]; then > > + echo >&2 "***" > > + echo >&2 "*** Running '$BINDGEN' to check the libclang version (used by the Rust" > > + echo >&2 "*** bindings generator) failed with code $bindgen_libclang_code. This may be caused by" > > + echo >&2 "*** a failure to locate libclang. See output and docs below for details:" > > + echo >&2 "***" > > + echo >&2 "$bindgen_libclang_output" > > + echo >&2 "***" > > + exit 1 > > +fi > > > > > Instead of toggling -e, why don't you write like this? > > > if ! bindgen_libclang_output=$(LC_ALL=C "$BINDGEN" $(dirname > $0)/rust_is_available_bindgen_libclang.h 2>&1); then > [snip] > fi > I meant this: if ! bindgen_libclang_output=$(LC_ALL=C "$BINDGEN" $(dirname $0)/rust_is_available_bindgen_libclang.h 2>&1 >/dev/null); then [snip] fi (">/dev/null" was lost in the previous email)
On Thu, Jan 12, 2023 at 5:35 AM Masahiro Yamada <masahiroy@kernel.org> wrote: > > I meant this: > > if ! bindgen_libclang_output=$(LC_ALL=C "$BINDGEN" $(dirname > $0)/rust_is_available_bindgen_libclang.h 2>&1 >/dev/null); then > [snip] > fi > > (">/dev/null" was lost in the previous email) I used the error code in the message below. I am happy either way. Cheers, Miguel
On Sat, Jan 14, 2023 at 8:10 AM Miguel Ojeda <miguel.ojeda.sandonis@gmail.com> wrote: > > On Thu, Jan 12, 2023 at 5:35 AM Masahiro Yamada <masahiroy@kernel.org> wrote: > > > > I meant this: > > > > if ! bindgen_libclang_output=$(LC_ALL=C "$BINDGEN" $(dirname > > $0)/rust_is_available_bindgen_libclang.h 2>&1 >/dev/null); then > > [snip] > > fi > > > > (">/dev/null" was lost in the previous email) > > I used the error code in the message below. I am happy either way. > > Cheers, > Miguel Ah, I see. How about this? bindgen_libclang_output=$(LC_ALL=C "$BINDGEN" $(dirname $0)/rust_is_available_bindgen_libclang.h 2>&1 >/dev/null) \ || bindgen_libclang_code=$? if [ -n "$bindgen_libclang_code" ]; then echo >&2 "***" echo >&2 "*** Running '$BINDGEN' to check the libclang version (used by the Rust" echo >&2 "*** bindings generator) failed with code $bindgen_libclang_code. This may be caused by" echo >&2 "*** a failure to locate libclang. See output and docs below for details:" echo >&2 "***" echo >&2 "$bindgen_libclang_output" echo >&2 "***" exit 1 fi You can get the error code of bindgen without toggling -e.
On Sat, Jan 14, 2023 at 10:44 AM Masahiro Yamada <masahiroy@kernel.org> wrote: > > Ah, I see. > > How about this? > > bindgen_libclang_output=$(LC_ALL=C "$BINDGEN" $(dirname > $0)/rust_is_available_bindgen_libclang.h 2>&1 >/dev/null) \ > || bindgen_libclang_code=$? > > You can get the error code of bindgen without toggling -e. As you prefer -- personally I tend to avoid assigning two variables in a single "statement" (like in C), but I am also happy avoiding to toggle `-e` since it is global state and therefore ugly too anyway. Cheers, Miguel
On Mon, Jan 9, 2023 at 9:45 PM Miguel Ojeda <ojeda@kernel.org> wrote: > > Reported-by: fvalenduc (@fvalenduc) Cc'ing François who gave emailed me his name and address, thus a better tag can be written here for v2. Cheers, Miguel
diff --git a/scripts/rust_is_available.sh b/scripts/rust_is_available.sh index c907cf881c2c..cd87729ca3bf 100755 --- a/scripts/rust_is_available.sh +++ b/scripts/rust_is_available.sh @@ -108,8 +108,29 @@ if [ "$rust_bindings_generator_cversion" -gt "$rust_bindings_generator_min_cvers fi # Check that the `libclang` used by the Rust bindings generator is suitable. +# +# In order to do that, first invoke `bindgen` to get the `libclang` version +# found by `bindgen`. This step may already fail if, for instance, `libclang` +# is not found, thus inform the user in such a case. +set +e +bindgen_libclang_output=$(LC_ALL=C "$BINDGEN" $(dirname $0)/rust_is_available_bindgen_libclang.h 2>&1 >/dev/null) +bindgen_libclang_code=$? +set -e +if [ $bindgen_libclang_code -ne 0 ]; then + echo >&2 "***" + echo >&2 "*** Running '$BINDGEN' to check the libclang version (used by the Rust" + echo >&2 "*** bindings generator) failed with code $bindgen_libclang_code. This may be caused by" + echo >&2 "*** a failure to locate libclang. See output and docs below for details:" + echo >&2 "***" + echo >&2 "$bindgen_libclang_output" + echo >&2 "***" + exit 1 +fi + +# `bindgen` returned successfully, thus use the output to check that the version +# of the `libclang` found by the Rust bindings generator is suitable. bindgen_libclang_version=$( \ - LC_ALL=C "$BINDGEN" $(dirname $0)/rust_is_available_bindgen_libclang.h 2>&1 >/dev/null \ + echo "$bindgen_libclang_output" \ | grep -F 'clang version ' \ | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' \ | head -n 1 \