Skip to content

ZJIT: Define make recipes only when configured (+2 misc.) #13915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 16, 2025
Merged

ZJIT: Define make recipes only when configured (+2 misc.) #13915

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9425c75
ZJIT: Define make recipes only when configured
XrXr Jul 16, 2025
38d0af1
DRY up CARGO_VERBOSE for JITs
XrXr Jul 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
ZJIT: Define make recipes only when configured 
This gives a better signal when say you try to run `make zjit-test` on a
YJIT-only build.
  • Loading branch information
@XrXr
XrXr committed Jul 16, 2025
commit 9425c75b9091eea566fafc7d420de8fcbc2e866c
13 changes: 8 additions & 5 deletions zjit/zjit.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# -*- mode: makefile-gmake; indent-tabs-mode: t -*-

# Put no definitions when ZJIT isn't configured
ifneq ($(ZJIT_SUPPORT),no)

# Show Cargo progress when doing `make V=1`
CARGO_VERBOSE_0 = -q
CARGO_VERBOSE_1 =
Expand All @@ -13,6 +16,8 @@ ZJIT_SRC_FILES = $(wildcard \
$(top_srcdir)/zjit/src/*/*/*/*.rs \
)

$(RUST_LIB): $(ZJIT_SRC_FILES)

# Because of Cargo cache, if the actual binary is not changed from the
# previous build, the mtime is preserved as the cached file.
# This means the target is not updated actually, and it will need to
Expand All @@ -31,10 +36,6 @@ $(BUILD_ZJIT_LIBS): $(ZJIT_SRC_FILES)
$(ZJIT_LIB_TOUCH)
endif

ifneq ($(ZJIT_SUPPORT),no)
$(RUST_LIB): $(ZJIT_SRC_FILES)
endif

# By using ZJIT_BENCH_OPTS instead of RUN_OPTS, you can skip passing the options to `make install`
ZJIT_BENCH_OPTS = $(RUN_OPTS) --enable-gems
ZJIT_BENCH = benchmarks/railsbench/benchmark.rb
Expand Down Expand Up @@ -110,4 +111,6 @@ libminiruby.a: miniruby$(EXEEXT)
$(Q) $(AR) $(ARFLAGS) $@ $(MINIOBJS) $(COMMONOBJS)

libminiruby: libminiruby.a
endif

endif # ifneq ($(strip $(CARGO)),
endif # ifneq ($(ZJIT_SUPPORT),no)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy