diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-18 05:26:47 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-18 05:26:47 +0000 |
| commit | 5da36600a192916c18b82ae56f0ea4ac496c2312 (patch) | |
| tree | 4310d1a5553f013d58345634d7b0f1f88aebd6b7 /configure.in | |
| parent | 2a47ee5e78c27c6cae830247dc8a1ca792899548 (diff) | |
| download | ruby-5da36600a192916c18b82ae56f0ea4ac496c2312.tar.gz | |
* configure.in: Revert r42604. It causes linking librt on systems
with newer glibc uselessly.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42606 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/configure.in b/configure.in index d1a42d9eb8..62aaf72f5f 100644 --- a/configure.in +++ b/configure.in @@ -1748,6 +1748,7 @@ 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(chroot) AC_CHECK_FUNCS(chsize) +AC_CHECK_FUNCS(clock_gettime) AC_CHECK_FUNCS(cosh) AC_CHECK_FUNCS(daemon) AC_CHECK_FUNCS(dl_iterate_phdr) @@ -1855,13 +1856,13 @@ RUBY_CHECK_BUILTIN_FUNC(__builtin_clzl, [__builtin_clzl(0)]) RUBY_CHECK_BUILTIN_FUNC(__builtin_clzll, [__builtin_clzll(0)]) # Some platform need -lrt for clock_gettime, but the other don't. -AC_CHECK_LIB(rt, clock_gettime) -if test x"$ac_cv_lib_rt_clock_gettime" = xyes; then +if test x"$ac_cv_func_clock_gettime" != xyes; then # glibc 2.17 moves clock_* functions from librt to the main C library. # http://sourceware.org/ml/libc-announce/2012/msg00001.html - ac_cv_func_clock_gettime="$ac_cv_lib_rt_clock_gettime" + AC_CHECK_LIB(rt, clock_gettime) + unset ac_cv_func_clock_gettime + AC_CHECK_FUNCS(clock_gettime) fi -AC_CHECK_FUNCS(clock_gettime) AC_CACHE_CHECK(for unsetenv returns a value, rb_cv_unsetenv_return_value, [AC_TRY_COMPILE([ |