mirror of
https://github.com/Ryujinx/SDL.git
synced 2025-07-05 19:20:35 +00:00
look for clock_gettime() in libc first, then in librt if not found.
This commit is contained in:
parent
634705851d
commit
22df572979
|
@ -1617,14 +1617,14 @@ elseif(UNIX AND NOT APPLE AND NOT RISCOS AND NOT HAIKU)
|
||||||
CheckPTHREAD()
|
CheckPTHREAD()
|
||||||
|
|
||||||
if(SDL_CLOCK_GETTIME)
|
if(SDL_CLOCK_GETTIME)
|
||||||
check_library_exists(rt clock_gettime "" FOUND_CLOCK_GETTIME_LIBRT)
|
|
||||||
if(FOUND_CLOCK_GETTIME_LIBRT)
|
|
||||||
list(APPEND EXTRA_LIBS rt)
|
|
||||||
set(HAVE_CLOCK_GETTIME 1)
|
|
||||||
else()
|
|
||||||
check_library_exists(c clock_gettime "" FOUND_CLOCK_GETTIME_LIBC)
|
check_library_exists(c clock_gettime "" FOUND_CLOCK_GETTIME_LIBC)
|
||||||
if(FOUND_CLOCK_GETTIME_LIBC)
|
if(FOUND_CLOCK_GETTIME_LIBC)
|
||||||
set(HAVE_CLOCK_GETTIME 1)
|
set(HAVE_CLOCK_GETTIME 1)
|
||||||
|
else()
|
||||||
|
check_library_exists(rt clock_gettime "" FOUND_CLOCK_GETTIME_LIBRT)
|
||||||
|
if(FOUND_CLOCK_GETTIME_LIBRT)
|
||||||
|
set(HAVE_CLOCK_GETTIME 1)
|
||||||
|
list(APPEND EXTRA_LIBS rt)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
93
configure
vendored
93
configure
vendored
|
@ -28404,52 +28404,6 @@ else $as_nop
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test x$enable_clock_gettime = xyes; then
|
if test x$enable_clock_gettime = xyes; then
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
|
|
||||||
printf %s "checking for clock_gettime in -lrt... " >&6; }
|
|
||||||
if test ${ac_cv_lib_rt_clock_gettime+y}
|
|
||||||
then :
|
|
||||||
printf %s "(cached) " >&6
|
|
||||||
else $as_nop
|
|
||||||
ac_check_lib_save_LIBS=$LIBS
|
|
||||||
LIBS="-lrt $LIBS"
|
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
||||||
/* end confdefs.h. */
|
|
||||||
|
|
||||||
/* Override any GCC internal prototype to avoid an error.
|
|
||||||
Use char because int might match the return type of a GCC
|
|
||||||
builtin and then its argument prototype would still apply. */
|
|
||||||
char clock_gettime ();
|
|
||||||
int
|
|
||||||
main (void)
|
|
||||||
{
|
|
||||||
return clock_gettime ();
|
|
||||||
;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
_ACEOF
|
|
||||||
if ac_fn_c_try_link "$LINENO"
|
|
||||||
then :
|
|
||||||
ac_cv_lib_rt_clock_gettime=yes
|
|
||||||
else $as_nop
|
|
||||||
ac_cv_lib_rt_clock_gettime=no
|
|
||||||
fi
|
|
||||||
rm -f core conftest.err conftest.$ac_objext conftest.beam \
|
|
||||||
conftest$ac_exeext conftest.$ac_ext
|
|
||||||
LIBS=$ac_check_lib_save_LIBS
|
|
||||||
fi
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5
|
|
||||||
printf "%s\n" "$ac_cv_lib_rt_clock_gettime" >&6; }
|
|
||||||
if test "x$ac_cv_lib_rt_clock_gettime" = xyes
|
|
||||||
then :
|
|
||||||
have_clock_gettime=yes
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test x$have_clock_gettime = xyes; then
|
|
||||||
|
|
||||||
printf "%s\n" "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h
|
|
||||||
|
|
||||||
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lrt"
|
|
||||||
else
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lc" >&5
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lc" >&5
|
||||||
printf %s "checking for clock_gettime in -lc... " >&6; }
|
printf %s "checking for clock_gettime in -lc... " >&6; }
|
||||||
if test ${ac_cv_lib_c_clock_gettime+y}
|
if test ${ac_cv_lib_c_clock_gettime+y}
|
||||||
|
@ -28494,7 +28448,52 @@ fi
|
||||||
|
|
||||||
printf "%s\n" "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h
|
printf "%s\n" "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h
|
||||||
|
|
||||||
EXTRA_LDFLAGS="$EXTRA_LDFLAGS"
|
else
|
||||||
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
|
||||||
|
printf %s "checking for clock_gettime in -lrt... " >&6; }
|
||||||
|
if test ${ac_cv_lib_rt_clock_gettime+y}
|
||||||
|
then :
|
||||||
|
printf %s "(cached) " >&6
|
||||||
|
else $as_nop
|
||||||
|
ac_check_lib_save_LIBS=$LIBS
|
||||||
|
LIBS="-lrt $LIBS"
|
||||||
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
|
/* end confdefs.h. */
|
||||||
|
|
||||||
|
/* Override any GCC internal prototype to avoid an error.
|
||||||
|
Use char because int might match the return type of a GCC
|
||||||
|
builtin and then its argument prototype would still apply. */
|
||||||
|
char clock_gettime ();
|
||||||
|
int
|
||||||
|
main (void)
|
||||||
|
{
|
||||||
|
return clock_gettime ();
|
||||||
|
;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
_ACEOF
|
||||||
|
if ac_fn_c_try_link "$LINENO"
|
||||||
|
then :
|
||||||
|
ac_cv_lib_rt_clock_gettime=yes
|
||||||
|
else $as_nop
|
||||||
|
ac_cv_lib_rt_clock_gettime=no
|
||||||
|
fi
|
||||||
|
rm -f core conftest.err conftest.$ac_objext conftest.beam \
|
||||||
|
conftest$ac_exeext conftest.$ac_ext
|
||||||
|
LIBS=$ac_check_lib_save_LIBS
|
||||||
|
fi
|
||||||
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5
|
||||||
|
printf "%s\n" "$ac_cv_lib_rt_clock_gettime" >&6; }
|
||||||
|
if test "x$ac_cv_lib_rt_clock_gettime" = xyes
|
||||||
|
then :
|
||||||
|
have_clock_gettime=yes
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test x$have_clock_gettime = xyes; then
|
||||||
|
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lrt"
|
||||||
|
|
||||||
|
printf "%s\n" "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h
|
||||||
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
11
configure.ac
11
configure.ac
|
@ -3681,15 +3681,14 @@ CheckClockGettime()
|
||||||
[AS_HELP_STRING([--enable-clock_gettime], [use clock_gettime() instead of gettimeofday() on UNIX [default=yes]])],
|
[AS_HELP_STRING([--enable-clock_gettime], [use clock_gettime() instead of gettimeofday() on UNIX [default=yes]])],
|
||||||
, enable_clock_gettime=yes)
|
, enable_clock_gettime=yes)
|
||||||
if test x$enable_clock_gettime = xyes; then
|
if test x$enable_clock_gettime = xyes; then
|
||||||
AC_CHECK_LIB(rt, clock_gettime, have_clock_gettime=yes)
|
|
||||||
if test x$have_clock_gettime = xyes; then
|
|
||||||
AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [ ])
|
|
||||||
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lrt"
|
|
||||||
else
|
|
||||||
AC_CHECK_LIB(c, clock_gettime, have_clock_gettime=yes)
|
AC_CHECK_LIB(c, clock_gettime, have_clock_gettime=yes)
|
||||||
if test x$have_clock_gettime = xyes; then
|
if test x$have_clock_gettime = xyes; then
|
||||||
AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [ ])
|
AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [ ])
|
||||||
EXTRA_LDFLAGS="$EXTRA_LDFLAGS"
|
else
|
||||||
|
AC_CHECK_LIB(rt, clock_gettime, have_clock_gettime=yes)
|
||||||
|
if test x$have_clock_gettime = xyes; then
|
||||||
|
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lrt"
|
||||||
|
AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [ ])
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue