summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--configure.in8
2 files changed, 1 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 8e7f9c563c..1bdb2190e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,11 +3,6 @@ Sun Jul 24 00:42:00 2011 Kenta Murata <mrkn@mrkn.jp>
* configure.in: change the default compiler to gcc-4.2 if target os
is OS X 10.7 (Lion).
-Sun Jul 24 00:19:13 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * configure.in: changed default optflags to -O0 if the compiler is
- llvm-gcc. It prevent ruby crash on OS X 10.7 (Lion).
-
Sat Jul 23 17:06:25 2011 Tanaka Akira <akr@fsij.org>
* io.c (rb_update_max_fd): validate fd.
diff --git a/configure.in b/configure.in
index ecb3a36ca2..6888087964 100644
--- a/configure.in
+++ b/configure.in
@@ -289,13 +289,7 @@ AC_PROG_GCC_TRADITIONAL
AC_SUBST(GCC)
if test "$GCC" = yes; then
linker_flag=-Wl,
- if test "$CC -v 2>&1 | grep LLVM" ; then
- # llvm-gcc's optimization strategy is far different from gcc.
- # It makes confusing our gcc specific optimized code.
- : ${optflags=-O0}
- else
- : ${optflags=-O3}
- fi
+ : ${optflags=-O3}
AS_CASE(["$target_os"], [linux*|darwin*], [: ${debugflags=-ggdb}])
RUBY_APPEND_OPTIONS(XCFLAGS, ["-include ruby/config.h" "-include ruby/missing.h"])
else