ref: 9b06ec46255f271f07c8354b90e2cd43ae2e0760
parent: 7d7577ec541f4396576ea65512da063e4987abe4
parent: e63c29c7603a49d18fee1192a5fe3895a0b05876
author: Martin Storsjö <martin@martin.st>
date: Tue May 8 15:04:12 EDT 2018
Merge "configure: Disable pthread_h if linking failed"
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -1491,7 +1491,7 @@
# 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); }
--- a/configure
+++ b/configure
@@ -585,7 +585,7 @@
# Use both check_header and check_lib here, since check_lib
# could be a stub that always returns true.
- check_header pthread.h && check_lib -lpthread <<EOF && enable_feature pthread_h
+ check_header pthread.h && check_lib -lpthread <<EOF || disable_feature pthread_h
#include <pthread.h>
#include <stddef.h>
int main(void) { return pthread_create(NULL, NULL, NULL, NULL); }