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_3@62144 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 11 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index f45d5982f3..792438da4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Jan 31 22:57:42 2018  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	configure.in: link Foundation framework
+
+	* configure.in (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]
+
 Wed Jan 31 22:51:59 2018  Pete Higgins  <pete@peterhiggins.org>
 
 	* thread_sync.c (Init_thread_sync): Remove confusing doc comments,
diff --git a/configure.in b/configure.in
index 0dbd5b1613..b5ba86213f 100644
--- a/configure.in
+++ b/configure.in
@@ -3987,8 +3987,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
diff --git a/version.h b/version.h
index d6d193a017..1999219065 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.3.7"
 #define RUBY_RELEASE_DATE "2018-01-31"
-#define RUBY_PATCHLEVEL 405
+#define RUBY_PATCHLEVEL 406
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 1