diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-12-20 11:54:58 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-12-20 11:54:58 +0000 |
| commit | 1a028670e131ec1698a468f2089cfdfd7fe6b1f6 (patch) | |
| tree | 70384dd57d2e1ca70eaba6cbc7b8c51f8214752c | |
| parent | 3d4a397354fd8d27c5eb91ca5c3bd7afe9b11af0 (diff) | |
merge revision(s) 60182: [Backport #14009]
configure.ac: link Foundation framework
* configure.ac (XLDFLAGS): link against Foundation framework and
let __NSPlaceholderDictionary initialize, to get rid of crash
after fork on macOS High Sierra. [ruby-core:83239] [Bug #14009]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@61358 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | version.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/configure.in b/configure.in index bb7cc4daa5..4a2243afa1 100644 --- a/configure.in +++ b/configure.in @@ -4144,8 +4144,8 @@ AS_CASE(["$target_os"], ], [darwin*], [ RUBY_APPEND_OPTION(CFLAGS, -pipe) - RUBY_APPEND_OPTION(XLDFLAGS, [-framework CoreFoundation]) - RUBY_APPEND_OPTION(LIBRUBYARG_STATIC, [-framework CoreFoundation]) + RUBY_APPEND_OPTION(XLDFLAGS, [-framework Foundation]) + RUBY_APPEND_OPTION(LIBRUBYARG_STATIC, [-framework Foundation]) ], [osf*], [ if test "$GCC" != "yes" ; then @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.4.4" -#define RUBY_RELEASE_DATE "2017-12-19" -#define RUBY_PATCHLEVEL 207 +#define RUBY_RELEASE_DATE "2017-12-20" +#define RUBY_PATCHLEVEL 208 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 19 +#define RUBY_RELEASE_DAY 20 #include "ruby/version.h" |