summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2024-03-22 22:05:58 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2024-03-22 22:05:58 +0900
commit78e12beb6d6d7ab7db962f3985ccc718e0060b1a (patch)
tree2589b93ad6f72d10bfe0f09dcc91af3b1173bbca
parentd85c24058dd4c3824f45691ad319c717d4570537 (diff)
Propagate jobserver FDs to `cargo` and `rustc` [ci skip]
https://doc.rust-lang.org/cargo/reference/build-scripts.html#jobserver > Cargo and `rustc` use the jobserver protocol, developed for GNU > make, to coordinate concurrency across processes. Older GNU make used FDs to connect to the jobserver, and needs an explicit use of `$(MAKE)` variable or `+` prefix to pass the FDs.
-rw-r--r--yjit/yjit.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/yjit/yjit.mk b/yjit/yjit.mk
index 1a8a3b8869..137085376d 100644
--- a/yjit/yjit.mk
+++ b/yjit/yjit.mk
@@ -23,7 +23,7 @@ YJIT_LIB_TOUCH = touch $@
ifeq ($(YJIT_SUPPORT),yes)
$(YJIT_LIBS): $(YJIT_SRC_FILES)
$(ECHO) 'building Rust YJIT (release mode)'
- $(Q) $(RUSTC) $(YJIT_RUSTC_ARGS)
+ +$(Q) $(RUSTC) $(YJIT_RUSTC_ARGS)
$(YJIT_LIB_TOUCH)
else ifeq ($(YJIT_SUPPORT),no)
$(YJIT_LIBS):
@@ -32,7 +32,7 @@ $(YJIT_LIBS):
else ifeq ($(YJIT_SUPPORT),$(filter dev dev_nodebug stats,$(YJIT_SUPPORT)))
$(YJIT_LIBS): $(YJIT_SRC_FILES)
$(ECHO) 'building Rust YJIT ($(YJIT_SUPPORT) mode)'
- $(Q)$(CHDIR) $(top_srcdir)/yjit && \
+ +$(Q)$(CHDIR) $(top_srcdir)/yjit && \
CARGO_TARGET_DIR='$(CARGO_TARGET_DIR)' \
CARGO_TERM_PROGRESS_WHEN='never' \
$(CARGO) $(CARGO_VERBOSE) build $(CARGO_BUILD_ARGS)