1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pass CARGO_BUILD_ARGS through properly

Browse Source
This commit is contained in:
Alan Wu 2025-02-06 15:38:12 -05:00 committed by Takashi Kokubun
parent e97d47d5fb
commit 5208720746
Notes: git 2025-04-18 13:49:31 +00:00 
Merged: https://github.com/ruby/ruby/pull/13131
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -3986,11 +3986,11 @@ AS_CASE(["${ZJIT_SUPPORT}"],
], ],
[dev], [ [dev], [
rb_rust_target_subdir=debug rb_rust_target_subdir=debug
ZJIT_CARGO_BUILD_ARGS='--features disasm,runtime_checks' CARGO_BUILD_ARGS='--profile dev'
AC_DEFINE(RUBY_DEBUG, 1) 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]) AC_CHECK_TOOL(CARGO, [cargo], [no])
AS_IF([test x"$CARGO" = "xno"], AS_IF([test x"$CARGO" = "xno"],
AC_MSG_ERROR([cargo is required. Installation instructions available at https://www.rust-lang.org/tools/install]) AC_MSG_ERROR([cargo is required. Installation instructions available at https://www.rust-lang.org/tools/install])

1
template/Makefile.in
View File

@ -113,7 +113,6 @@ ZJIT_LIBOBJ = $(ZJIT_LIBS:.a=.@OBJEXT@)
CARGO_TARGET_DIR=@abs_top_builddir@/yjit/target CARGO_TARGET_DIR=@abs_top_builddir@/yjit/target
CARGO_BUILD_ARGS=@CARGO_BUILD_ARGS@ CARGO_BUILD_ARGS=@CARGO_BUILD_ARGS@
ZJIT_CARGO_TARGET_DIR=@abs_top_builddir@/zjit/target ZJIT_CARGO_TARGET_DIR=@abs_top_builddir@/zjit/target
ZJIT_CARGO_BUILD_ARGS=@CARGO_BUILD_ARGS@
LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@ LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
EXE_LDFLAGS = $(LDFLAGS) EXE_LDFLAGS = $(LDFLAGS)
EXTLDFLAGS = @EXTLDFLAGS@ EXTLDFLAGS = @EXTLDFLAGS@