summaryrefslogtreecommitdiff
path: root/common.mk
diff options
context:
space:
mode:
authorDaniel Colson <danieljamescolson@gmail.com>2025-05-16 13:31:43 -0400
committerGitHub <noreply@github.com>2025-05-16 17:31:43 +0000
commiteead83160bcc5f49706e05669e5a7e2620b9b605 (patch)
tree2b453ce707650917b182ddcde01dac213fecf097 /common.mk
parentcc90adb68d8457a5c79af6cb732906a882438092 (diff)
Prevent enabling yjit when zjit enabled (GH-13358)
`ruby --yjit --zjit` already warns and exits, but it was still possible to enable both with `ruby --zjit -e 'RubyVM:YJIT.enable`. This commit prevents that with a warning and an early return. (We could also exit, but that seems a bit unfriendly once we're already running the program.) Co-authored-by: ywenc <ywenc@github.com>
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/13358 Merged-By: XrXr
Diffstat (limited to 'common.mk')
-rw-r--r--common.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/common.mk b/common.mk
index 1eaeb31d04..e8c4e8d40e 100644
--- a/common.mk
+++ b/common.mk
@@ -21737,6 +21737,7 @@ yjit.$(OBJEXT): {$(VPATH)}vm_sync.h
yjit.$(OBJEXT): {$(VPATH)}yjit.c
yjit.$(OBJEXT): {$(VPATH)}yjit.h
yjit.$(OBJEXT): {$(VPATH)}yjit.rbinc
+yjit.$(OBJEXT): {$(VPATH)}zjit.h
zjit.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
zjit.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
zjit.$(OBJEXT): $(CCAN_DIR)/list/list.h