Skip to content

Commit 459035a

Browse files
authored
Merge pull request Rust-for-Linux#860 from ojeda/scripts-underscore
scripts: move `rust-is-available` to `rust_is_available`
2 parents b460d18 + 5c3358e commit 459035a

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1284,7 +1284,7 @@ prepare0: archprepare
12841284
# All the preparing..
12851285
prepare: prepare0
12861286
ifdef CONFIG_RUST
1287-
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/rust-is-available.sh -v
1287+
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/rust_is_available.sh -v
12881288
$(Q)$(MAKE) $(build)=rust
12891289
endif
12901290

@@ -1800,7 +1800,7 @@ $(DOC_TARGETS):
18001800
# "Is Rust available?" target
18011801
PHONY += rustavailable
18021802
rustavailable:
1803-
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/rust-is-available.sh -v && echo "Rust is available!"
1803+
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/rust_is_available.sh -v && echo "Rust is available!"
18041804

18051805
# Documentation target
18061806
#

init/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ config LLD_VERSION
6161
default 0
6262

6363
config RUST_IS_AVAILABLE
64-
def_bool $(success,$(srctree)/scripts/rust-is-available.sh)
64+
def_bool $(success,$(srctree)/scripts/rust_is_available.sh)
6565
help
6666
This shows whether a suitable Rust toolchain is available (found).
6767

scripts/rust-is-available.sh renamed to scripts/rust_is_available.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ fi
101101

102102
# Check that the `libclang` used by the Rust bindings generator is suitable.
103103
bindgen_libclang_version=$( \
104-
LC_ALL=C "$BINDGEN" $(dirname $0)/rust-is-available-bindgen-libclang.h 2>&1 >/dev/null \
104+
LC_ALL=C "$BINDGEN" $(dirname $0)/rust_is_available_bindgen_libclang.h 2>&1 >/dev/null \
105105
| grep -F 'clang version ' \
106106
| grep -oE '[0-9]+\.[0-9]+\.[0-9]+' \
107107
| head -n 1 \

0 commit comments

Comments
 (0)