summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--configure.in2
-rw-r--r--version.h2
3 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 1671741a5c..e98a4ff34a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb 22 21:42:16 2012 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * configure.in: remove workaround replacement from gcc to gcc-4.2.
+ [Backport #6043]
+
Wed Feb 22 08:11:06 2012 Narihiro Nakamura <authornari@gmail.com>
* gc.c : remove gc_clear_mark_on_sweep_slots() and use
diff --git a/configure.in b/configure.in
index 50174cec6a..8f8261aac4 100644
--- a/configure.in
+++ b/configure.in
@@ -104,11 +104,9 @@ then
fi
AS_CASE(["$build_os"],
[darwin11.*], [
- : ${CC:=gcc-4.2}
AS_CASE(["x$CC"],
[xgcc-4.2|x/usr/bin/gcc-4.2], [: ${CXX=g++-4.2}],
[xgcc|x/usr/bin/gcc], [: ${CXX=g++}],
- [xcc-4.2|x/usr/bin/cc-4.2], [: ${CXX=c++-4.2}],
[xcc|x/usr/bin/cc], [: ${CXX=c++}],
[xclang|x/usr/bin/clang], [: ${CXX=clang++}])
])
diff --git a/version.h b/version.h
index 3b2e1fabfc..c1353e2cb4 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 136
+#define RUBY_PATCHLEVEL 137
#define RUBY_RELEASE_DATE "2012-02-22"
#define RUBY_RELEASE_YEAR 2012