summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--configure.in8
-rw-r--r--version.h4
3 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9962fcb152..8d605f8077 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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 29c5c126eb..b90f689e8b 100644
--- a/configure.in
+++ b/configure.in
@@ -277,7 +277,13 @@ AC_PROG_GCC_TRADITIONAL
AC_SUBST(GCC)
if test "$GCC" = yes; then
linker_flag=-Wl,
- : ${optflags=-O3}
+ 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
AS_CASE(["$target_os"], [linux*|darwin*], [: ${debugflags=-ggdb}])
RUBY_APPEND_OPTIONS(XCFLAGS, ["-include ruby/config.h" "-include ruby/missing.h"])
else
diff --git a/version.h b/version.h
index 98ab0319de..52435c4954 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL -1
-#define RUBY_RELEASE_DATE "2011-07-23"
+#define RUBY_RELEASE_DATE "2011-07-24"
#define RUBY_RELEASE_YEAR 2011
#define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 23
+#define RUBY_RELEASE_DAY 24
#include "ruby/version.h"