diff options
| author | Martin Storsjö <martin@martin.st> | 2018-05-08 19:04:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-05-08 19:04:12 +0000 |
| commit | 9b06ec46255f271f07c8354b90e2cd43ae2e0760 (patch) | |
| tree | 61362a3a1606fbe697b31bbbe9586a6d6a5e2737 | |
| parent | 7d7577ec541f4396576ea65512da063e4987abe4 (diff) | |
| parent | e63c29c7603a49d18fee1192a5fe3895a0b05876 (diff) | |
| download | libvpx-9b06ec46255f271f07c8354b90e2cd43ae2e0760.tar libvpx-9b06ec46255f271f07c8354b90e2cd43ae2e0760.tar.gz libvpx-9b06ec46255f271f07c8354b90e2cd43ae2e0760.tar.bz2 libvpx-9b06ec46255f271f07c8354b90e2cd43ae2e0760.zip | |
Merge "configure: Disable pthread_h if linking failed"
| -rw-r--r-- | build/make/configure.sh | 2 | ||||
| -rwxr-xr-x | configure | 2 |
2 files changed, 2 insertions, 2 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); } @@ -585,7 +585,7 @@ EOF # 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); } |