diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-07-24 22:47:26 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-07-24 22:47:26 +0000 |
| commit | 44903e5d9ffc2762e32507da263c51858d324e08 (patch) | |
| tree | 6c7abb74ab217d8ae206552bb2d72f8d773240e5 /libstdc++-v3/acinclude.m4 | |
| parent | 2336da2a67f696b891e8d09104ae6040964da228 (diff) | |
| download | gcc-44903e5d9ffc2762e32507da263c51858d324e08.tar.gz | |
2008-07-24 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/36924
Revert:
2008-07-23 Chris Fairles <chris.fairles@gmail.com>
* acinclude.m4 ([GLIBCXX_CHECK_CLOCK_GETTIME]): Define GLIBCXX_LIBS.
Holds the lib that defines clock_gettime (-lrt or -lposix4).
* src/Makefile.am: Use it.
* configure: Regenerate.
* configure.in: Likewise.
* Makefile.in: Likewise.
* src/Makefile.in: Likewise.
* libsup++/Makefile.in: Likewise.
* po/Makefile.in: Likewise.
* doc/Makefile.in: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@138127 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/acinclude.m4')
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index fcb1ca19146..e998471c446 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -1017,18 +1017,10 @@ AC_DEFUN([GLIBCXX_CHECK_CLOCK_GETTIME], [ AC_LANG_SAVE AC_LANG_CPLUSPLUS ac_save_CXXFLAGS="$CXXFLAGS" - ac_save_LIBS="$LIBS" - CXXFLAGS="$CXXFLAGS -fno-exceptions" - - AC_SEARCH_LIBS(clock_gettime, [rt posix4]) - case "$ac_cv_search_clock_gettime" in - -l*) GLIBCXX_LIBS=$ac_cv_search_clock_gettime - esac - AC_CHECK_HEADERS(unistd.h, ac_has_unistd_h=yes, ac_has_unistd_h=no) - + ac_has_clock_monotonic=no; ac_has_clock_realtime=no; if test x"$ac_has_unistd_h" = x"yes"; then @@ -1058,7 +1050,7 @@ AC_DEFUN([GLIBCXX_CHECK_CLOCK_GETTIME], [ AC_MSG_RESULT($ac_has_clock_realtime) fi - + if test x"$ac_has_clock_monotonic" = x"yes"; then AC_DEFINE(_GLIBCXX_USE_CLOCK_MONOTONIC, 1, [ Defined if clock_gettime has monotonic clock support. ]) @@ -1069,10 +1061,7 @@ AC_DEFUN([GLIBCXX_CHECK_CLOCK_GETTIME], [ [ Defined if clock_gettime has realtime clock support. ]) fi - AC_SUBST(GLIBCXX_LIBS) - CXXFLAGS="$ac_save_CXXFLAGS" - LIBS="$ac_save_LIBS" AC_LANG_RESTORE ]) |