ruby-changes:70675
From: NAKAMURA <ko1@a...>
Date: Fri, 31 Dec 2021 19:49:07 +0900 (JST)
Subject: [ruby-changes:70675] c24f436c2a (ruby_2_7): merge revision(s) 9f8a50723f8a84b3e4755b418570148f422d1b28: [Backport #17836]
https://git.ruby-lang.org/ruby.git/commit/?id=c24f436c2a From c24f436c2a4b343f9cb4950260376546f5ff0d06 Mon Sep 17 00:00:00 2001 From: NAKAMURA Usaku <usa@r...> Date: Fri, 31 Dec 2021 19:47:57 +0900 Subject: merge revision(s) 9f8a50723f8a84b3e4755b418570148f422d1b28: [Backport #17836] Specify -c to emit pch with clang (#4423) [Bug #17836] --- mjit_worker.c | 1 + 1 file changed, 1 insertion(+) --- mjit_worker.c | 1 + version.h | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mjit_worker.c b/mjit_worker.c index ce8133ac7da..95518883c69 100644 --- a/mjit_worker.c +++ b/mjit_worker.c @@ -752,6 +752,7 @@ make_pch(void) https://github.com/ruby/ruby/blob/trunk/mjit_worker.c#L752 const char *rest_args[] = { # ifdef __clang__ "-emit-pch", + "-c", # endif // -nodefaultlibs is a linker flag, but it may affect cc1 behavior on Gentoo, which should NOT be changed on pch: // https://gitweb.gentoo.org/proj/gcc-patches.git/tree/7.3.0/gentoo/13_all_default-ssp-fix.patch diff --git a/version.h b/version.h index 14ea82108ca..2b7d4f8f910 100644 --- a/version.h +++ b/version.h @@ -1,12 +1,12 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L1 # define RUBY_VERSION_MAJOR RUBY_API_VERSION_MAJOR # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR -#define RUBY_VERSION_TEENY 5 +#define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 203 +#define RUBY_PATCHLEVEL 204 #define RUBY_RELEASE_YEAR 2021 -#define RUBY_RELEASE_MONTH 11 -#define RUBY_RELEASE_DAY 24 +#define RUBY_RELEASE_MONTH 12 +#define RUBY_RELEASE_DAY 31 #include "ruby/version.h" -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/