8000 merge revision(s) r48174: [Backport #10438] · github/ruby@35168b8 · GitHub
[go: up one dir, main page]
Skip to content

Commit 35168b8

Browse files
nagachikanagachika
committed
merge revision(s) r48174: [Backport ruby#10438]
 * configure.in: remove apple-gcc4.2 from CC candidates. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@48177 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent 205003b commit 35168b8

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

‎ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
Tue Oct 28 22:30:21 2014 NARUSE, Yui <naruse@ruby-lang.org>
2+
3+
* configure.in: remove apple-gcc4.2 from CC candidates.
4+
15
火 10 28 22:19:44 2014 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
26

37
* version.h (RUBY_VERSION): bump RUBY_VERSION to 2.1.5.

‎configure.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ fi
423423
RUBY_NACL
424424
AS_CASE(["$host_os:$build_os"],
425425
[darwin*:darwin*], [
426-
AC_CHECK_TOOLS(CC, [gcc-4.2 clang gcc cc])
426+
AC_CHECK_TOOLS(CC, [clang gcc cc])
427427
# Following Apple deployed clang are broken
428428
# clang version 1.0 (http://llvm.org/svn/llvm-project/cfe/tags/Apple/clang-23 exported)
429429
# Apple clang version 2.0 (tags/Apple/clang-137) (based on LLVM 2.9svn)

‎version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#define RUBY_VERSION "2.1.5"
22
#define RUBY_RELEASE_DATE "2014-10-28"
3-
#define RUBY_PATCHLEVEL 266
3+
#define RUBY_PATCHLEVEL 267
44

55
#define RUBY_RELEASE_YEAR 2014
66
#define RUBY_RELEASE_MONTH 10

0 commit comments

Comments
 (0)
0