diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-01-26 07:59:11 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-01-26 07:59:11 +0000 |
commit | 66be165f30cb6a7d52634ce817013e510094bb1e (patch) | |
tree | ef9fc0970acbb53d6b5b706929c31f912ddd3c9d /version.h | |
parent | ad6e91def4f1fc5b8fabe98e7be28749406c7c2b (diff) |
merge revision(s) 66823,66869: [Backport #15548]
Revert "mjit_worker.c: try passing -nostdlib to AIX"
This reverts commit b32fb23083912c37a2601c66531ed786a7c9f3e5.
This didn't work on AIX.
mjit_worker.c: do not use GCC_NOSTDLIB_FLAGS for OpenBSD
OpenBSD's GCC compiler has local extensions that break when
`-nostartfiles -nodefaultlibs -nostdlib` is used.
From: Jeremy Evans <merch-redmine@jeremyevans.net>
[Bug #15548]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@66924 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r-- | version.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,10 +1,10 @@ #define RUBY_VERSION "2.6.1" #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 26 +#define RUBY_PATCHLEVEL 27 #define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 24 +#define RUBY_RELEASE_DAY 26 #include "ruby/version.h" |