From: Andy Polyakov <appro@openssl.org>
Date: Fri, 19 Oct 2018 20:24:30 +0000 (+0200)
Subject: Configurations/15-android.conf: detect NDK llvm-ar.
X-Git-Tag: openssl-3.0.0-alpha1~2972
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ddf2e8c8ccad49cff0d6a0a0b26ca892ec4ce33a;p=oweals%2Fopenssl.git

Configurations/15-android.conf: detect NDK llvm-ar.

This excluses user from additional PATH adjustments in case NDK has
llvm-ar.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7443)
---

diff --git a/Configurations/15-android.conf b/Configurations/15-android.conf
index f9ad0833fa..10342ed5e3 100644
--- a/Configurations/15-android.conf
+++ b/Configurations/15-android.conf
@@ -94,6 +94,11 @@
                         .  "/$tritools-4.9/prebuilt/$host";
                 $user{CC} = "clang" if ($user{CC} !~ m|clang|);
                 $user{CROSS_COMPILE} = undef;
+                if (which("llvm-ar") =~ m|^$ndk/.*/prebuilt/([^/]+)/|) {
+                    $user{AR} = "llvm-ar";
+                    $user{ARFLAGS} = [ "rs" ];
+                    $user{RANLIB} = ":";
+                }
             } elsif (-f "$ndk/AndroidVersion.txt") {    #"standalone toolchain"
                 my $cc = $user{CC} // "clang";
                 # One can probably argue that both clang and gcc should be