From 728ae63da008586dea20712f645c0aedea5e1701 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 5 Nov 2021 04:33:49 +0000
Subject: [PATCH] Move visibility and clock/timer fun checks to RTS configure
Actual library check (which will set the Cabal flag) is left in the
top-level configure for now.
Progress towards #17191
---
configure.ac | 16 ++--------------
rts/configure.ac | 8 ++++++++
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/configure.ac b/configure.ac
index ac0ae0f36098..8050155733a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -991,21 +991,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_PTHREAD_LIB
AC_SUBST([UseLibpthread])
diff --git a/rts/configure.ac b/rts/configure.ac
index a146495d1164..d4a74525dad1 100644
--- a/rts/configure.ac
+++ b/rts/configure.ac
@@ -33,6 +33,14 @@ 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_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])],
--
GitLab