diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-02 06:36:12 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-02 06:36:12 +0000 |
| commit | 575d4a306945cfa8265667651fbf4357d3ff73ff (patch) | |
| tree | 25bad8482e1493c8e71bc452a9d79ee59bcb901a | |
| parent | ad0e8beb8cd96c23a37acb4841d3ef41fbd8cc08 (diff) | |
| download | ruby-575d4a306945cfa8265667651fbf4357d3ff73ff.tar.gz | |
configure.in: _setjmp only if _longjmp is found
* configure.in: do not check _setjmp unless _longjmp is available,
so that configure results will not be changed by cache.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49804 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 5 |
2 files changed, 7 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Mon Mar 2 15:36:10 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in: do not check _setjmp unless _longjmp is available, + so that configure results will not be changed by cache. + Mon Mar 2 14:44:56 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * configure.in (RUBY_REPLACE_TYPE): restore unsigned type from diff --git a/configure.in b/configure.in index 4f2d1b7a68..a538c41759 100644 --- a/configure.in +++ b/configure.in @@ -2067,6 +2067,8 @@ AC_FUNC_FORK AC_CHECK_FUNCS(__syscall) AC_CHECK_FUNCS(_longjmp) # used for AC_ARG_WITH(setjmp-type) +# we don't use _setjmp if _longjmp doesn't exist. +test x$ac_cv_func__longjmp = xno && ac_cv_func__setjmp=no AC_CHECK_FUNCS(_setjmp) # used for AC_ARG_WITH(setjmp-type) AC_CHECK_FUNCS(_setjmpex) # used for AC_ARG_WITH(setjmp-type) AC_CHECK_FUNCS(atan2l atan2f) @@ -2344,9 +2346,6 @@ AC_CACHE_CHECK(for __builtin_setjmp, ac_cv_func___builtin_setjmp, 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) |