2 files changed, 11 insertions, 7 deletions
diff --git a/common.mk b/common.mk
index aea4d02c5f..88934378f4 100644
--- a/common.mk
+++ b/common.mk
@@ -303,7 +303,7 @@ showflags:
 	"	LC_ALL = $(LC_ALL)" \
 	"	LC_CTYPE = $(LC_CTYPE)" \
 	"	MFLAGS = $(MFLAGS)" \
-	"	RUST = $(RUST)" \
+	"	RUSTC = $(RUSTC)" \
 	"	YJIT_RUSTC_ARGS = $(YJIT_RUSTC_ARGS)" \
 	$(MESSAGE_END)
 	-@$(CC_VERSION)
diff --git a/configure.ac b/configure.ac
index bb83865010..8c176db836 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3754,15 +3754,19 @@ AC_ARG_ENABLE(yjit,
     AS_HELP_STRING([--enable-yjit],
     [enable experimental in-process JIT compiler that requires Rust build tools [default=no]]),
     [YJIT_SUPPORT=$enableval],
-    [
-        AS_IF([test x"$RUSTC" != "xno"],
+    [AS_CASE(["$enable_jit_support:$YJIT_TARGET_OK:$RUSTC"],
+        [no:*|yes:no:*|yes:yes:no], [
+            YJIT_SUPPORT=no
+        ],
+        [yes:yes:*], [
             AS_IF([ echo "fn main() { let x = 1; format!(\"{x}\"); }" | $RUSTC - --emit asm=/dev/null ],
-                [YJIT_SUPPORT="$YJIT_TARGET_OK"],
+                [YJIT_SUPPORT=yes],
                 [YJIT_SUPPORT=no]
-            ),
+            )
+        ], [
             [YJIT_SUPPORT=no]
-        )
-    ]
+        ]
+    )]
 )
 
 CARGO=