summaryrefslogtreecommitdiff
path: root/scripts/Kconfig.include
diff options
context:
space:
mode:
authorThomas Hellström <thomas.hellstrom@linux.intel.com>2024-11-04 11:21:20 +0300
committerThomas Hellström <thomas.hellstrom@linux.intel.com>2024-11-04 11:21:20 +0300
commitc787c2901e2c03008e536b86cb0103ce6fd05e2d (patch)
tree06966989052f14f98c9b1ede0ea98822f317a586 /scripts/Kconfig.include
parenta19d1db9a3fa89fabd7c83544b84f393ee9b851f (diff)
parent30169bb64580bd7bce9290c1952bf0aa6cc37fe5 (diff)
downloadlinux-c787c2901e2c03008e536b86cb0103ce6fd05e2d.tar.xz
Merge drm/drm-next into drm-xe-next
Backmerging to get up-to-date and to bring in a fix that was merged through drm-misc-fixes. Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Diffstat (limited to 'scripts/Kconfig.include')
-rw-r--r--scripts/Kconfig.include3
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