diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-11-04 15:27:32 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-11-04 15:27:32 +0000 |
| commit | fb3ed90dd3cc5f9bf465deaa421c0d581dceb953 (patch) | |
| tree | d60c222e7235bc8a6f73e3efda546cd462438f2b | |
| parent | a1dd49fd28741da9093601eacf40f190c426fe78 (diff) | |
merge revision(s) r48184: [Backport #10272] [Backport #10438]
* configure.in (__builtin_setjmp): disable with gcc/clang earlier
than 4.3 on Mac OS X. [ruby-core:65174] [Bug #10272]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@48274 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 5 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Wed Nov 5 00:18:22 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (__builtin_setjmp): disable with gcc/clang earlier + than 4.3 on Mac OS X. [ruby-core:65174] [Bug #10272] + Wed Nov 5 00:01:04 2014 Tanaka Akira <akr@fsij.org> * bignum.c (bary_mul_balance_with_mulfunc): Fix free work area diff --git a/configure.in b/configure.in index 1f25bfbfa3..5968bbdb14 100644 --- a/configure.in +++ b/configure.in @@ -453,7 +453,9 @@ if test "$GCC" = yes; then linker_flag=-Wl, : ${optflags=-O3} gcc_major=`echo =__GNUC__ | $CC -E -xc - | sed '/^=/!d;s///'` + gcc_minor=`echo =__GNUC_MINOR__ | $CC -E -xc - | sed '/^=/!d;s///'` test -n "$gcc_major" || gcc_major=0 + test -n "$gcc_minor" || gcc_minor=0 # RUBY_APPEND_OPTIONS(XCFLAGS, ["-include ruby/config.h" "-include ruby/missing.h"]) else linker_flag= @@ -956,6 +958,9 @@ AS_CASE(["$target_os"], ac_cv_type_getgroups=gid_t # getgroups() on Rosetta fills garbage ac_cv_lib_crypt_crypt=no ac_cv_func_fdatasync=no # Mac OS X wrongly reports it has fdatasync() + if test $gcc_major -lt 4 -o \( $gcc_major -eq 4 -a $gcc_minor -lt 3 \); then + ac_cv_func___builtin_setjmp=no + fi AC_CACHE_CHECK(for broken crypt with 8bit chars, rb_cv_broken_crypt, [AC_TRY_RUN([ #include <stdio.h> @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.1.5" #define RUBY_RELEASE_DATE "2014-11-05" -#define RUBY_PATCHLEVEL 269 +#define RUBY_PATCHLEVEL 270 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 11 |