[前][次][番号順一覧][スレッド一覧]

ruby-changes:36103

From: nobu <ko1@a...>
Date: Wed, 29 Oct 2014 11:48:32 +0900 (JST)
Subject: [ruby-changes:36103] nobu:r48184 (trunk): configure.in: fix for old Apple compilers

nobu	2014-10-29 11:48:25 +0900 (Wed, 29 Oct 2014)

  New Revision: 48184

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=48184

  Log:
    configure.in: fix for old Apple compilers
    
    * configure.in (__builtin_setjmp): disable with gcc/clang earlier
      than 4.3 on Mac OS X.  [ruby-core:65174] [Bug #10272]

  Modified files:
    trunk/ChangeLog
    trunk/configure.in
Index: configure.in
===================================================================
--- configure.in	(revision 48183)
+++ configure.in	(revision 48184)
@@ -494,7 +494,9 @@ if test "$GCC" = yes; then https://github.com/ruby/ruby/blob/trunk/configure.in#L494
     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=
@@ -1001,6 +1003,9 @@ AS_CASE(["$target_os"], https://github.com/ruby/ruby/blob/trunk/configure.in#L1003
 		ac_cv_lib_crypt_crypt=no
 		ac_cv_func_fdatasync=no # Mac OS X wrongly reports it has fdatasync()
 		ac_cv_func_vfork=no
+		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>
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 48183)
+++ ChangeLog	(revision 48184)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Oct 29 11:48:23 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (__builtin_setjmp): disable with gcc/clang earlier
+	  than 4.3 on Mac OS X.  [ruby-core:65174] [Bug #10272]
+
 Wed Oct 29 11:43:43 2014  Marc-Andre Lafortune  <ruby-core@m...>
 
 	* lib/matrix.rb: Generalize Vector#cross_product to arbitrary

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]