ruby-changes:70007
From: nagachika <ko1@a...>
Date: Thu, 2 Dec 2021 08:05:31 +0900 (JST)
Subject: [ruby-changes:70007] 69272c74a3 (ruby_3_0): merge revision(s) 9f8a50723f8a84b3e4755b418570148f422d1b28: [Backport #17836]
https://git.ruby-lang.org/ruby.git/commit/?id=69272c74a3 From 69272c74a3f675373fc6c6f32b685620da8a85ee Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@r...> Date: Thu, 2 Dec 2021 08:05:08 +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 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mjit_worker.c b/mjit_worker.c index e2db644c920..d3e333da31e 100644 --- a/mjit_worker.c +++ b/mjit_worker.c @@ -869,6 +869,7 @@ make_pch(void) https://github.com/ruby/ruby/blob/trunk/mjit_worker.c#L869 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 0b3cf9832ab..1cdc1f413f7 100644 --- a/version.h +++ b/version.h @@ -12,7 +12,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L12 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 4 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 159 +#define RUBY_PATCHLEVEL 160 #define RUBY_RELEASE_YEAR 2021 #define RUBY_RELEASE_MONTH 12 -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/