ruby-changes:72751
From: John <ko1@a...>
Date: Sat, 30 Jul 2022 08:32:30 +0900 (JST)
Subject: [ruby-changes:72751] 0e85586ecc (master): Add --enable-yjit=dev_nodebug configure option
https://git.ruby-lang.org/ruby.git/commit/?id=0e85586ecc From 0e85586ecc983ebb4541cd046949428d1ef5d635 Mon Sep 17 00:00:00 2001 From: John Hawthorn <john@h...> Date: Fri, 29 Jul 2022 15:07:06 -0700 Subject: Add --enable-yjit=dev_nodebug configure option --- configure.ac | 8 ++++++-- yjit/Cargo.toml | 3 +++ yjit/yjit.mk | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 46ea038865..864a9a4e8b 100644 --- a/configure.ac +++ b/configure.ac @@ -3736,7 +3736,7 @@ CARGO= https://github.com/ruby/ruby/blob/trunk/configure.ac#L3736 CARGO_BUILD_ARGS= YJIT_LIBS= AS_CASE(["${YJIT_SUPPORT}"], -[yes|dev|stats], [ +[yes|dev|stats|dev_nodebug], [ AS_IF([test x"$enable_jit_support" = "xno"], AC_MSG_ERROR([--disable-jit-support but --enable-yjit. YJIT requires JIT support]) ) @@ -3754,9 +3754,13 @@ AS_CASE(["${YJIT_SUPPORT}"], https://github.com/ruby/ruby/blob/trunk/configure.ac#L3754 CARGO_BUILD_ARGS='--features stats,disasm,asm_comments' AC_DEFINE(RUBY_DEBUG, 1) ], + [dev_nodebug], [ + rb_rust_target_subdir=dev_nodebug + CARGO_BUILD_ARGS='--profile dev_nodebug --features stats,disasm,asm_comments' + ], [stats], [ rb_rust_target_subdir=stats - CARGO_BUILD_ARGS='--profile stats --features stats,disasm,asm_comments' + CARGO_BUILD_ARGS='--profile stats --features stats' ]) AS_IF([test -n "${CARGO_BUILD_ARGS}"], [ diff --git a/yjit/Cargo.toml b/yjit/Cargo.toml index c7ff31ec2c..4641de205f 100644 --- a/yjit/Cargo.toml +++ b/yjit/Cargo.toml @@ -33,6 +33,9 @@ overflow-checks = true https://github.com/ruby/ruby/blob/trunk/yjit/Cargo.toml#L33 [profile.stats] inherits = "release" +[profile.dev_nodebug] +inherits = "release" + [profile.release] # NOTE: --enable-yjit builds use `rustc` without going through Cargo. You # might want to update the `rustc` invocation if you change this profile. diff --git a/yjit/yjit.mk b/yjit/yjit.mk index efd4ff0c40..9e3155deb3 100644 --- a/yjit/yjit.mk +++ b/yjit/yjit.mk @@ -33,6 +33,7 @@ yjit-static-lib-cargo: https://github.com/ruby/ruby/blob/trunk/yjit/yjit.mk#L33 $(CARGO) $(CARGO_VERBOSE) build $(CARGO_BUILD_ARGS) yjit-static-lib-dev: yjit-static-lib-cargo +yjit-static-lib-dev_nodebug: yjit-static-lib-cargo yjit-static-lib-stats: yjit-static-lib-cargo # This PHONY prerequisite makes it so that we always run cargo. When there are -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/