From 520872074603d99432e206b55461fe6d62dd305a Mon Sep 17 00:00:00 2001 From: Alan Wu Date: Thu, 6 Feb 2025 15:38:12 -0500 Subject: [PATCH] Pass CARGO_BUILD_ARGS through properly --- configure.ac | 4 ++-- template/Makefile.in | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 498cde3f47..7d6ec072d0 100644 --- a/configure.ac +++ b/configure.ac @@ -3986,11 +3986,11 @@ AS_CASE(["${ZJIT_SUPPORT}"], ], [dev], [ rb_rust_target_subdir=debug - ZJIT_CARGO_BUILD_ARGS='--features disasm,runtime_checks' + CARGO_BUILD_ARGS='--profile dev' AC_DEFINE(RUBY_DEBUG, 1) ]) - AS_IF([test -n "${ZJIT_CARGO_BUILD_ARGS}"], [ + AS_IF([test -n "${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]) diff --git a/template/Makefile.in b/template/Makefile.in index 77924f33da..09d955cc70 100644 --- a/template/Makefile.in +++ b/template/Makefile.in @@ -113,7 +113,6 @@ ZJIT_LIBOBJ = $(ZJIT_LIBS:.a=.@OBJEXT@) CARGO_TARGET_DIR=@abs_top_builddir@/yjit/target CARGO_BUILD_ARGS=@CARGO_BUILD_ARGS@ ZJIT_CARGO_TARGET_DIR=@abs_top_builddir@/zjit/target -ZJIT_CARGO_BUILD_ARGS=@CARGO_BUILD_ARGS@ LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@ EXE_LDFLAGS = $(LDFLAGS) EXTLDFLAGS = @EXTLDFLAGS@