nagachika	2014-10-28 22:32:36 +0900 (Tue, 28 Oct 2014)

  New Revision: 48177

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=48177

  Log:
    merge revision(s) r48174: [Backport #10438]
    
    * configure.in: remove apple-gcc4.2 from CC candidates.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/configure.in
    branches/ruby_2_1/version.h
Index: ruby_2_1/configure.in
===================================================================
--- ruby_2_1/configure.in	(revision 48176)
+++ ruby_2_1/configure.in	(revision 48177)
@@ -423,7 +423,7 @@ fi https://github.com/ruby/ruby/blob/trunk/ruby_2_1/configure.in#L423
 RUBY_NACL
 AS_CASE(["$host_os:$build_os"],
 [darwin*:darwin*], [
-    AC_CHECK_TOOLS(CC, [gcc-4.2 clang gcc cc])
+    AC_CHECK_TOOLS(CC, [clang gcc cc])
     # Following Apple deployed clang are broken
     # clang version 1.0 (http://llvm.org/svn/llvm-project/cfe/tags/Apple/clang-23 exported)
     # Apple clang version 2.0 (tags/Apple/clang-137) (based on LLVM 2.9svn)
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 48176)
+++ ruby_2_1/ChangeLog	(revision 48177)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Tue Oct 28 22:30:21 2014  NARUSE, Yui  <naruse@r...>
+
+	* configure.in: remove apple-gcc4.2 from CC candidates.
+
 10 28 22:19:44 2014  CHIKANAGA Tomoyuki  <nagachika@r...>
 
 	* version.h (RUBY_VERSION): bump RUBY_VERSION to 2.1.5.
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 48176)
+++ ruby_2_1/version.h	(revision 48177)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.5"
 #define RUBY_RELEASE_DATE "2014-10-28"
-#define RUBY_PATCHLEVEL 266
+#define RUBY_PATCHLEVEL 267
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 10

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r48174


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/