From 357352af5ee37bf31ba4468ee242ea5a10158461 Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Tue, 19 Oct 2021 12:59:39 -0700 Subject: [PATCH] Do not enable RUBY_DEVEL by RUBY_PATCHLEVEL This makes RUBY_DEVEL not enabled automatically. It still can be enabled manually. Test manually using RUBY_DEVEL in CI. Implements [Feature #17468] --- .github/workflows/compilers.yml | 1 + configure.ac | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/compilers.yml b/.github/workflows/compilers.yml index ab29a7acc5..bd082039b3 100644 --- a/.github/workflows/compilers.yml +++ b/.github/workflows/compilers.yml @@ -154,6 +154,7 @@ jobs: - { name: NDEBUG, env: { cppflags: '-DNDEBUG' } } - { name: RUBY_DEBUG, env: { cppflags: '-DRUBY_DEBUG' } } + - { name: RUBY_DEVEL, env: { cppflags: '-DRUBY_DEVEL' } } # - { name: ARRAY_DEBUG, env: { cppflags: '-DARRAY_DEBUG' } } # - { name: BIGNUM_DEBUG, env: { cppflags: '-DBIGNUM_DEBUG' } } # - { name: CCAN_LIST_DEBUG, env: { cppflags: '-DCCAN_LIST_DEBUG' } } diff --git a/configure.ac b/configure.ac index 9ed0c1ef9e..575bdf6631 100644 --- a/configure.ac +++ b/configure.ac @@ -622,8 +622,7 @@ AS_IF([test "$fdeclspec" = yes], [ RUBY_APPEND_OPTIONS(CXXFLAGS, -fdeclspec) ]) -AS_CASE([$RUBY_PATCHLEVEL], [-*], - [RUBY_DEVEL=yes], [RUBY_DEVEL=no]) +AS_IF([test "x$RUBY_DEVEL" != xyes], [RUBY_DEVEL=no]) particular_werror_flags=$RUBY_DEVEL AC_ARG_ENABLE(werror, AS_HELP_STRING([--disable-werror],