Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 05:13:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Drop hard requirement on explicit -lpthread support"

Browse source 
This reverts commit b402b635a9f7466616cef6e2b9cfd55a6e7068c5; as discussed in #5512 it is not
required.
This commit is contained in:
David Adam 2019-02-12 22:30:53 +08:00
parent bbc3fecbeb
commit 7200f7ff4a
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cmake/ConfigureChecks.cmake
View file

@ -31,12 +31,7 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)
IF(CMAKE_VERSION VERSION_LESS 3.4.0) IF(CMAKE_VERSION VERSION_LESS 3.4.0)
ENABLE_LANGUAGE(C) ENABLE_LANGUAGE(C)
ENDIF() ENDIF()
# Don't set pthreads to required. Either we're on a platform where explict FIND_PACKAGE(Threads REQUIRED)
# linking with -lpthread is the norm (e.g. Linux) and it'll be found, or we're
# on a platform that include pthreads by default (e.g. BSD, macOS) where this
# won't find anything, or we're on a road-much-less-traveled OS where the user
# can figure out what's wrong without a hard error here. See #5512.
FIND_PACKAGE(Threads)
# Detect WSL. Does not match against native Windows/WIN32. # Detect WSL. Does not match against native Windows/WIN32.
if (CMAKE_HOST_SYSTEM_VERSION MATCHES ".*-Microsoft") if (CMAKE_HOST_SYSTEM_VERSION MATCHES ".*-Microsoft")