nobu	2014-05-09 14:27:07 +0900 (Fri, 09 May 2014)

  New Revision: 45885

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

  Log:
    configure.in: check for setjmp type with CCDLFLAGS
    
    * configure.in (RUBY_SETJMP_TYPE): check for setjmp type after
      CCDLFLAGS is appended to CFLAGS, since __builtin_setjmp can be
      affected.  [ruby-core:62469] [Bug #9818]

  Modified files:
    trunk/ChangeLog
    trunk/configure.in
Index: configure.in
===================================================================
--- configure.in	(revision 45884)
+++ configure.in	(revision 45885)
@@ -2151,6 +2151,7 @@ AC_CACHE_CHECK(for sigsetjmp as a macro https://github.com/ruby/ruby/blob/trunk/configure.in#L2151
 	ac_cv_func_sigsetjmp=yes,
 	ac_cv_func_sigsetjmp=no)])
 
+AC_DEFUN(RUBY_CHECK_BUILTIN_SETJMP, [
 if test x"${ac_cv_func___builtin_setjmp}" = xyes; then
    unset ac_cv_func___builtin_setjmp
 fi
@@ -2172,10 +2173,13 @@ AC_CACHE_CHECK(for __builtin_setjmp, ac_ https://github.com/ruby/ruby/blob/trunk/configure.in#L2173
 	])
 	test "$ac_cv_func___builtin_setjmp" = no || break
     done])
+])
 
 # we don't use _setjmp if _longjmp doesn't exist.
 test x$ac_cv_func__longjmp = xno && ac_cv_func__setjmp=no
 
+AC_DEFUN(RUBY_SETJMP_TYPE, [
+RUBY_CHECK_BUILTIN_SETJMP
 AC_MSG_CHECKING(for setjmp type)
 setjmp_suffix=
 AC_ARG_WITH(setjmp-type,
@@ -2220,6 +2224,7 @@ AC_MSG_RESULT(${setjmp_prefix}setjmp${se https://github.com/ruby/ruby/blob/trunk/configure.in#L2224
 AC_DEFINE_UNQUOTED([RUBY_SETJMP(env)], [${setjmp_prefix}setjmp${setjmp_suffix}($setjmp_cast(env)${setjmp_sigmask+,0})])
 AC_DEFINE_UNQUOTED([RUBY_LONGJMP(env,val)], [${setjmp_prefix}longjmp($setjmp_cast(env),val)])
 AC_DEFINE_UNQUOTED(RUBY_JMP_BUF, ${setjmp_sigmask+${setjmp_prefix}}jmp_buf)
+])
 # End of setjmp check.
 
 AC_ARG_ENABLE(setreuid,
@@ -3474,6 +3479,7 @@ AC_SUBST(DTRACE_OBJ) https://github.com/ruby/ruby/blob/trunk/configure.in#L3479
 AC_SUBST(DTRACE_GLOMMED_OBJ)
 AC_SUBST(LIBRUBY_A_OBJS)
 
+RUBY_SETJMP_TYPE
 }
 { # build section
 
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 45884)
+++ ChangeLog	(revision 45885)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Fri May  9 14:27:05 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (RUBY_SETJMP_TYPE): check for setjmp type after
+	  CCDLFLAGS is appended to CFLAGS, since __builtin_setjmp can be
+	  affected.  [ruby-core:62469] [Bug #9818]
+
 Fri May  9 03:59:06 2014  Ayumu AIZAWA  <ayumu.aizawa@g...>
 
 	* lib/delegate.rb: Fix example of using delegator.

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