summaryrefslogtreecommitdiff
path: root/yjit
diff options
context:
space:
mode:
authorAlan Wu <XrXr@users.noreply.github.com>2022-12-08 15:02:21 -0500
committerAlan Wu <XrXr@users.noreply.github.com>2022-12-08 15:58:00 -0500
commit47a5b34aba514fd075664b4cf0e95e0f7f26609f (patch)
tree2c3045fde28efd31e8ddd0056586d9fceef12e15 /yjit
parent2ae26554de200adc0d557776e2d2c3eb91c6ec90 (diff)
YJIT: Fold check-yjit-bindings into yjit-bindgen
So it's shorter on CI and the hint about how the fix the failure shows up. It's going to print a diff locally too, but that should be fine.
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/6883
Diffstat (limited to 'yjit')
-rw-r--r--yjit/yjit.mk5
1 files changed, 1 insertions, 4 deletions
diff --git a/yjit/yjit.mk b/yjit/yjit.mk
index fc0061eb29..cc7b42d26a 100644
--- a/yjit/yjit.mk
+++ b/yjit/yjit.mk
@@ -62,11 +62,8 @@ ifneq ($(strip $(CARGO)),) # if configure found Cargo
.PHONY: yjit-bindgen yjit-bindgen-show-unused
yjit-bindgen: yjit.$(OBJEXT)
YJIT_SRC_ROOT_PATH='$(top_srcdir)' $(CARGO) run --manifest-path '$(top_srcdir)/yjit/bindgen/Cargo.toml' -- $(CFLAGS) $(XCFLAGS) $(CPPFLAGS)
+ if [ 'x$(HAVE_GIT)' = xyes ]; then $(GIT) -C "$(top_srcdir)" diff --exit-code yjit/src/cruby_bindings.inc.rs; fi
check-yjit-bindgen-unused: yjit.$(OBJEXT)
RUST_LOG=warn YJIT_SRC_ROOT_PATH='$(top_srcdir)' $(CARGO) run --manifest-path '$(top_srcdir)/yjit/bindgen/Cargo.toml' -- $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) 2>&1 | (! grep "unused option: --allow")
-
-# For CI, check whether YJIT's FFI bindings are up-to-date.
-check-yjit-bindings: check-yjit-bindgen-unused
- git -C "$(top_srcdir)" diff --exit-code yjit/src/cruby_bindings.inc.rs
endif