diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-11-05 04:33:49 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2023-01-02 02:55:22 -0500 |
| commit | 569129db8be9fa3e76348bfa27bd73f1d7e7bce8 (patch) | |
| tree | 7fd0d5ff8122fb23dd90408d8848ce5d2d998d2d | |
| parent | a8fe729b61cefcb586102a4c996152b5a385ba09 (diff) | |
| download | haskell-569129db8be9fa3e76348bfa27bd73f1d7e7bce8.tar.gz | |
Move visibility and clock_gettime checks to RTS configure
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | rts/configure.ac | 9 |
2 files changed, 11 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index 33d83ddf84..430fb467e3 100644 --- a/configure.ac +++ b/configure.ac @@ -992,21 +992,9 @@ else AC_SUBST([CabalLeadingUnderscore],[False]) fi -FP_VISIBILITY_HIDDEN - -FP_MUSTTAIL - dnl ** check for librt -AC_CHECK_LIB([rt], [clock_gettime]) -AC_CHECK_LIB([rt], [clock_gettime], HaveLibrt=YES, HaveLibrt=NO) -if test $HaveLibrt = YES -then - AC_SUBST([UseLibrt],[YES]) -else - AC_SUBST([UseLibrt],[NO]) -fi -AC_CHECK_FUNCS(clock_gettime timer_settime) -FP_CHECK_TIMER_CREATE +AC_CHECK_LIB([rt], [clock_gettime], UseLibrt=YES, UseLibrt=NO) +AC_SUBST([UseLibrt]) FP_CHECK_PTHREADS AS_IF([test x"$need_lpthread" = 1], diff --git a/rts/configure.ac b/rts/configure.ac index 4c54c97394..5e702f2bed 100644 --- a/rts/configure.ac +++ b/rts/configure.ac @@ -33,6 +33,15 @@ GHC_CONVERT_PLATFORM_PARTS([host], [Host]) FPTOOLS_SET_PLATFORM_VARS([host], [Host]) FPTOOLS_SET_HASKELL_PLATFORM_VARS([Host]) +FP_VISIBILITY_HIDDEN + +FP_MUSTTAIL + +dnl ** check for librt +AC_CHECK_LIB([rt], [clock_gettime]) +AC_CHECK_FUNCS(clock_gettime timer_settime) +FP_CHECK_TIMER_CREATE + dnl ** check for Apple's "interesting" long double compatibility scheme AC_MSG_CHECKING(for printf\$LDBLStub) AC_LINK_IFELSE([AC_LANG_CALL([], [printf\$LDBLStub])], |