From 39dc648f6026d30e2e5d230c7f2469d2926258bf Mon Sep 17 00:00:00 2001
From: Butta <repo@butta.fastem.com>
Date: Sat, 6 Nov 2021 01:32:37 +0530
Subject: [PATCH] Android: switch the archiver for static libraries over to
 llvm-ar

---
 .../Jobs/GenericUnixToolchain+LinkerSupport.swift          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift b/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift
index 5b9204fbd..98ecb4e13 100644
--- a/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift
+++ b/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift
@@ -301,7 +301,12 @@ extension GenericUnixToolchain {
                             lto == nil ? $0.type == .object
                                        : $0.type == .object || $0.type == .llvmBitcode
                          }.map { .path($0.file) })
-      return try getToolPath(.staticLinker(lto))
+      if targetTriple.environment == .android {
+        // Always use the LTO archiver llvm-ar for Android
+        return try getToolPath(.staticLinker(.llvmFull))
+      } else {
+        return try getToolPath(.staticLinker(lto))
+      }
     }
 
   }