summaryrefslogtreecommitdiff
path: root/build/make/configure.sh
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2018-05-04 09:32:41 +0300
committerMartin Storsjo <martin@martin.st>2018-05-04 09:37:51 +0300
commite63c29c7603a49d18fee1192a5fe3895a0b05876 (patch)
tree8a00447e93271ced9026c37c72b04ec2404a96d5 /build/make/configure.sh
parent04d8700862851885ae5c164dac82d3e0c44965ab (diff)
downloadlibvpx-e63c29c7603a49d18fee1192a5fe3895a0b05876.tar
libvpx-e63c29c7603a49d18fee1192a5fe3895a0b05876.tar.gz
libvpx-e63c29c7603a49d18fee1192a5fe3895a0b05876.tar.bz2
libvpx-e63c29c7603a49d18fee1192a5fe3895a0b05876.zip
configure: Disable pthread_h if linking failed
When doing both check_header and check_lib, the check_header call will already enable pthread_h if the header was found. This was overlooked when the pthread linking check was amended into a header check and a separate linking check in 9b7d4cce635e. This brings back the same result as the original check in 38dc27cc6. Change-Id: I0efb38f5780f7c79e2eb2b14290d6094096ea222
Diffstat (limited to 'build/make/configure.sh')
-rw-r--r--build/make/configure.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/make/configure.sh b/build/make/configure.sh
index 876255bfe..c4e3b5141 100644
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -1491,7 +1491,7 @@ EOF
# bionic includes basic pthread functionality, obviating -lpthread.
;;
*)
- check_header pthread.h && check_lib -lpthread <<EOF && enable_feature pthread_h && add_extralibs -lpthread
+ check_header pthread.h && check_lib -lpthread <<EOF && add_extralibs -lpthread || disable_feature pthread_h
#include <pthread.h>
#include <stddef.h>
int main(void) { return pthread_create(NULL, NULL, NULL, NULL); }