summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@ruby-lang.org>2021-12-02 08:05:08 +0900
committernagachika <nagachika@ruby-lang.org>2021-12-02 08:05:08 +0900
commit69272c74a3f675373fc6c6f32b685620da8a85ee (patch)
treeb68e6ba60138388acf8ea31f28ec6d1071da2f0f
parent5c5974dbd00e1e0a827baed5290517208878355d (diff)
downloadruby-69272c74a3f675373fc6c6f32b685620da8a85ee.tar.gz
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(+)
-rw-r--r--mjit_worker.c1
-rw-r--r--version.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/mjit_worker.c b/mjit_worker.c
index e2db644c92..d3e333da31 100644
--- a/mjit_worker.c
+++ b/mjit_worker.c
@@ -869,6 +869,7 @@ make_pch(void)
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 0b3cf9832a..1cdc1f413f 100644
--- a/version.h
+++ b/version.h
@@ -12,7 +12,7 @@
# 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