diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-10-19 08:32:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-10-19 08:32:47 -0700 |
| commit | 4e6bd4a33a6cf4d2dce9725630ada847a3947c7c (patch) | |
| tree | 2533733c6a052d20026140dc93df7e7f4e630911 /scripts/Kconfig.include | |
| parent | 3d5ad2d4eca337e80f38df77de89614aa5aaceb9 (diff) | |
| parent | 8b8ca9c25fe69c2162e3235c7d6c341127abeed6 (diff) | |
| download | linux-4e6bd4a33a6cf4d2dce9725630ada847a3947c7c.tar.gz linux-4e6bd4a33a6cf4d2dce9725630ada847a3947c7c.zip | |
Merge tag 'rust-fixes-6.12-2' of https://github.com/Rust-for-Linux/linux
Pull rust fixes from Miguel Ojeda:
"Toolchain and infrastructure:
- Fix several issues with the 'rustc-option' macro. It includes a
refactor from Masahiro of three '{cc,rust}-*' macros, which is not
a fix but avoids repeating the same commands (which would be
several lines in the case of 'rustc-option').
- Fix conditions for 'CONFIG_HAVE_CFI_ICALL_NORMALIZE_INTEGERS'. It
includes the addition of 'CONFIG_RUSTC_LLVM_VERSION', which is not
a fix but is needed for the actual fix.
And a trivial grammar fix"
* tag 'rust-fixes-6.12-2' of https://github.com/Rust-for-Linux/linux:
cfi: fix conditions for HAVE_CFI_ICALL_NORMALIZE_INTEGERS
kbuild: rust: add `CONFIG_RUSTC_LLVM_VERSION`
kbuild: fix issues with rustc-option
kbuild: refactor cc-option-yn, cc-disable-warning, rust-option-yn macros
lib/Kconfig.debug: fix grammar in RUST_BUILD_ASSERT_ALLOW
Diffstat (limited to 'scripts/Kconfig.include')
| -rw-r--r-- | scripts/Kconfig.include | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/Kconfig.include b/scripts/Kconfig.include index 785a491e5996..33193ca6e803 100644 --- a/scripts/Kconfig.include +++ b/scripts/Kconfig.include @@ -65,6 +65,9 @@ cc-option-bit = $(if-success,$(CC) -Werror $(1) -E -x c /dev/null -o /dev/null,$ m32-flag := $(cc-option-bit,-m32) m64-flag := $(cc-option-bit,-m64) +rustc-version := $(shell,$(srctree)/scripts/rustc-version.sh $(RUSTC)) +rustc-llvm-version := $(shell,$(srctree)/scripts/rustc-llvm-version.sh $(RUSTC)) + # $(rustc-option,<flag>) # Return y if the Rust compiler supports <flag>, n otherwise # Calls to this should be guarded so that they are not evaluated if |