diff options
| author | Takashi Kokubun <[email protected]> | 2025-02-06 16:07:30 -0500 |
|---|---|---|
| committer | Takashi Kokubun <[email protected]> | 2025-04-18 21:52:57 +0900 |
| commit | 92d48f47a3866d05f09a3746deb61e7e6c978a0c (patch) | |
| tree | 9a32685cfd991a5bab74b3779f25fc0f22b854b4 | |
| parent | 94f572f6b49f9cd3373cfd8a9c79284e4df32d64 (diff) | |
Use separate cargo build flags
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/13131
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | template/Makefile.in | 1 | ||||
| -rw-r--r-- | zjit/zjit.mk | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 7d6ec072d0..0c70fbf964 100644 --- 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 index 09d955cc70..a1476e9beb 100644 --- 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 index c12929f0e2..01a1bf30d3 100644 --- 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 |