From a1467200c36ce80dacb8d9d0d50049765809b6f4 Mon Sep 17 00:00:00 2001
From: Anthony Green <green@moxielogic.com>
Date: Mon, 26 Sep 2022 11:41:48 -0400
Subject: Never link pthread for android

---
 testsuite/lib/libffi.exp | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/testsuite/lib/libffi.exp b/testsuite/lib/libffi.exp
index d21e4e5..7457af4 100644
--- a/testsuite/lib/libffi.exp
+++ b/testsuite/lib/libffi.exp
@@ -397,20 +397,23 @@ proc libffi_target_compile { source dest type options } {
 
     lappend options "libs= -lffi"
 
-    if { [string match "aarch64*-*-linux*" $target_triplet] } {
-	lappend options "libs= -lpthread"
-    }
+    if { ![string match "*android*" $target_triplet] } {
 
-    # this may be required for g++, but just confused clang.
-    if { [string match "*.cc" $source] } {
-        lappend options "c++"
-      if { [string match "*-*-darwin*" $target_triplet] } {
-  	  lappend options "libs= -lc++"
-      }
-    }
+        if { [string match "aarch64*-*-linux*" $target_triplet] } {
+            lappend options "libs= -lpthread"
+        }
 
-    if { [string match "arc*-*-linux*" $target_triplet] } {
-	lappend options "libs= -lpthread"
+        # this may be required for g++, but just confused clang.
+        if { [string match "*.cc" $source] } {
+            lappend options "c++"
+            if { [string match "*-*-darwin*" $target_triplet] } {
+                lappend options "libs= -lc++"
+            }
+        }
+
+        if { [string match "arc*-*-linux*" $target_triplet] } {
+            lappend options "libs= -lpthread"
+        }
     }
 
     verbose "options: $options"
-- 
cgit v1.2.1