| Message ID | 20230616001631.463536-3-ojeda@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | `scripts/rust_is_available.sh` improvements | expand |
On 6/15/23 21:16, Miguel Ojeda wrote: > From: Russell Currey <ruscur@russell.cc> > > rust_is_available.sh uses cc-version.sh to identify which C compiler is > in use, as scripts/Kconfig.include does. cc-version.sh isn't designed to > be able to handle multiple arguments in one variable, i.e. "ccache clang". > Its invocation in rust_is_available.sh quotes "$CC", which makes > $1 == "ccache clang" instead of the intended $1 == ccache & $2 == clang. > > cc-version.sh could also be changed to handle having "ccache clang" as one > argument, but it only has the one consumer upstream, making it simpler to > fix the caller here. > > Signed-off-by: Russell Currey <ruscur@russell.cc> > Fixes: 78521f3399ab ("scripts: add `rust_is_available.sh`") > Link: https://github.com/Rust-for-Linux/linux/pull/873 > [ Reworded title prefix and reflow line to 75 columns. ] > Signed-off-by: Miguel Ojeda <ojeda@kernel.org> > --- > [...] Reviewed-by: Martin Rodriguez Reboredo <yakoyoku@gmail.com>
On Fri, Jun 16, 2023 at 02:16:22AM +0200, Miguel Ojeda wrote: > From: Russell Currey <ruscur@russell.cc> > > rust_is_available.sh uses cc-version.sh to identify which C compiler is > in use, as scripts/Kconfig.include does. cc-version.sh isn't designed to > be able to handle multiple arguments in one variable, i.e. "ccache clang". > Its invocation in rust_is_available.sh quotes "$CC", which makes > $1 == "ccache clang" instead of the intended $1 == ccache & $2 == clang. > > cc-version.sh could also be changed to handle having "ccache clang" as one > argument, but it only has the one consumer upstream, making it simpler to > fix the caller here. > > Signed-off-by: Russell Currey <ruscur@russell.cc> > Fixes: 78521f3399ab ("scripts: add `rust_is_available.sh`") > Link: https://github.com/Rust-for-Linux/linux/pull/873 > [ Reworded title prefix and reflow line to 75 columns. ] > Signed-off-by: Miguel Ojeda <ojeda@kernel.org> Reviewed-by: Nathan Chancellor <nathan@kernel.org> > --- > scripts/rust_is_available.sh | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/scripts/rust_is_available.sh b/scripts/rust_is_available.sh > index f43a010eaf30..0c9be438e4cd 100755 > --- a/scripts/rust_is_available.sh > +++ b/scripts/rust_is_available.sh > @@ -113,10 +113,10 @@ fi > # > # In the future, we might be able to perform a full version check, see > # https://github.com/rust-lang/rust-bindgen/issues/2138. > -cc_name=$($(dirname $0)/cc-version.sh "$CC" | cut -f1 -d' ') > +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 \ > + 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 > -- > 2.41.0 >
diff --git a/scripts/rust_is_available.sh b/scripts/rust_is_available.sh index f43a010eaf30..0c9be438e4cd 100755 --- a/scripts/rust_is_available.sh +++ b/scripts/rust_is_available.sh @@ -113,10 +113,10 @@ fi # # In the future, we might be able to perform a full version check, see # https://github.com/rust-lang/rust-bindgen/issues/2138. -cc_name=$($(dirname $0)/cc-version.sh "$CC" | cut -f1 -d' ') +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 \ + 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