Skip to content

Commit 06b9703

Browse files
authored
Revert "Fix HAVE_PTHREAD_CONDATTR_SETCLOCK detection on Android (#58701)" (#58755)
This reverts commit a6d9e63.
1 parent 721a802 commit 06b9703

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

src/libraries/Native/Unix/configure.cmake

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ endif()
6060
# Older CMake versions (3.8) do not assign the result of their tests, causing unused-value errors
6161
# which are not distinguished from the test failing. So no error for that one.
6262
# For clang-5.0 avoid errors like "unused variable 'err' [-Werror,-Wunused-variable]".
63-
set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Werror -Wno-error=unused-value -Wno-error=unused-variable -Wno-error=builtin-requires-header")
63+
set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Werror -Wno-error=unused-value -Wno-error=unused-variable")
6464

6565
# Apple platforms like macOS/iOS allow targeting older operating system versions with a single SDK,
6666
# the mere presence of a symbol in the SDK doesn't tell us whether the deployment target really supports it.
@@ -671,16 +671,7 @@ check_symbol_exists(
671671
time.h
672672
HAVE_CLOCK_GETTIME_NSEC_NP)
673673

674-
check_library_exists(pthread pthread_create "" HAVE_LIBPTHREAD)
675-
check_library_exists(c pthread_create "" HAVE_PTHREAD_IN_LIBC)
676-
677-
if (HAVE_LIBPTHREAD)
678-
set(PTHREAD_LIBRARY pthread)
679-
elseif (HAVE_PTHREAD_IN_LIBC)
680-
set(PTHREAD_LIBRARY c)
681-
endif()
682-
683-
check_library_exists(${PTHREAD_LIBRARY} pthread_condattr_setclock "" HAVE_PTHREAD_CONDATTR_SETCLOCK)
674+
check_library_exists(pthread pthread_condattr_setclock "" HAVE_PTHREAD_CONDATTR_SETCLOCK)
684675

685676
check_symbol_exists(
686677
futimes

0 commit comments

Comments
 (0)