ruby-changes:65229
From: nagachika <ko1@a...>
Date: Thu, 11 Feb 2021 14:08:22 +0900 (JST)
Subject: [ruby-changes:65229] f03ba00f40 (ruby_2_7): merge revision(s) 43a9a974e276dc49b03ec81ccace0adb534a3d20: [Backport #17021] [Backport #17605]
https://git.ruby-lang.org/ruby.git/commit/?id=f03ba00f40 From f03ba00f40e7c964efcfffc7a761074800ecc1a4 Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@r...> Date: Thu, 11 Feb 2021 13:35:28 +0900 Subject: merge revision(s) 43a9a974e276dc49b03ec81ccace0adb534a3d20: [Backport #17021] [Backport #17605] [Bug #17021] Make host_* values consistent with target_* --- configure.ac | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) --- configure.ac | 7 ++++++- version.h | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index db8ab27..9077f4b 100644 --- a/configure.ac +++ b/configure.ac @@ -309,9 +309,14 @@ AC_SUBST(CC_VERSION_MESSAGE, $cc_version_message) https://github.com/ruby/ruby/blob/trunk/configure.ac#L309 : ${DLDFLAGS="$LDFLAGS"} RUBY_UNIVERSAL_ARCH -AS_IF([test "$target_cpu" != "$host_cpu" -a "$GCC" = yes -a "$cross_compiling" = no -a "$universal_binary" = no], [ +AS_IF([test "$target_cpu" != "$host_cpu" -a "$GCC" = yes -a "$cross_compiling" = no -a "${universal_binary:-no}" = no], [ RUBY_DEFAULT_ARCH("$target_cpu") ]) +host_os=$target_os +host_vendor=$target_vendor +host_cpu=$target_cpu +host=$target +host_alias=$target_alias AS_CASE(["$target_os"], [darwin*], [ if libtool 2>&1 | grep no_warning_for_no_symbols > /dev/null; then diff --git a/version.h b/version.h index 0f507c0..84a5b16 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L2 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 3 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 153 +#define RUBY_PATCHLEVEL 154 #define RUBY_RELEASE_YEAR 2021 #define RUBY_RELEASE_MONTH 2 -- cgit v1.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/