Use separate cargo build flags

k0kubun · k0kubun · commit 92d48f47a386 · 2025-04-18T21:52:57.000+09:00
diff --git a/configure.ac b/configure.ac
@@ -3986,11 +3986,11 @@ AS_CASE(["${ZJIT_SUPPORT}"],
     ],
     [dev], [
 	rb_rust_target_subdir=debug
-	CARGO_BUILD_ARGS='--profile dev'
+	ZJIT_CARGO_BUILD_ARGS='--profile dev --features disasm'
 	AC_DEFINE(RUBY_DEBUG, 1)
     ])
 
-    AS_IF([test -n "${CARGO_BUILD_ARGS}"], [
+    AS_IF([test -n "${ZJIT_CARGO_BUILD_ARGS}"], [
              AC_CHECK_TOOL(CARGO, [cargo], [no])
              AS_IF([test x"$CARGO" = "xno"],
                 AC_MSG_ERROR([cargo is required. Installation instructions available at https://www.rust-lang.org/tools/install])
@@ -4015,6 +4015,7 @@ AC_SUBST(YJIT_SUPPORT)dnl what flavor of YJIT the Ruby build includes
 AC_SUBST(RUSTC)dnl Rust compiler command
 AC_SUBST(CARGO)dnl Cargo command for Rust builds
 AC_SUBST(CARGO_BUILD_ARGS)dnl for selecting Rust build profiles
+AC_SUBST(ZJIT_CARGO_BUILD_ARGS)dnl for selecting Rust build profiles
 AC_SUBST(YJIT_LIBS)dnl for optionally building the Rust parts of YJIT
 AC_SUBST(YJIT_OBJ)dnl for optionally building the C parts of YJIT
 AC_SUBST(ZJIT_SUPPORT)dnl what flavor of ZJIT the Ruby build includes
diff --git a/template/Makefile.in b/template/Makefile.in
@@ -112,6 +112,7 @@ ZJIT_OBJ=@ZJIT_OBJ@
 ZJIT_LIBOBJ = $(ZJIT_LIBS:.a=.@OBJEXT@)
 CARGO_TARGET_DIR=@abs_top_builddir@/yjit/target
 CARGO_BUILD_ARGS=@CARGO_BUILD_ARGS@
+ZJIT_CARGO_BUILD_ARGS=@ZJIT_CARGO_BUILD_ARGS@
 ZJIT_CARGO_TARGET_DIR=@abs_top_builddir@/zjit/target
 LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
 EXE_LDFLAGS = $(LDFLAGS)
diff --git a/zjit/zjit.mk b/zjit/zjit.mk
@@ -35,7 +35,7 @@ $(ZJIT_LIBS): $(ZJIT_SRC_FILES)
 	+$(Q)$(CHDIR) $(top_srcdir)/zjit && \
 	        CARGO_TARGET_DIR='$(ZJIT_CARGO_TARGET_DIR)' \
 	        CARGO_TERM_PROGRESS_WHEN='never' \
-	        $(CARGO) $(CARGO_VERBOSE) build $(CARGO_BUILD_ARGS)
+	        $(CARGO) $(CARGO_VERBOSE) build $(ZJIT_CARGO_BUILD_ARGS)
 	$(ZJIT_LIB_TOUCH)
 else
 endif
