diff options
| author | Andy Polyakov <appro@openssl.org> | 2018-10-19 22:24:30 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-10-31 15:45:03 +0100 |
| commit | 3b1928fe64e36634e09482c721f4d3d0c10047a8 (patch) | |
| tree | 6b94d865245b86955b1d78ea7d2d8876b76de2ec | |
| parent | 3453dbde7f0c44bcb97f85ee5291fc4fde0a45b2 (diff) | |
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)
(cherry picked from commit ddf2e8c8ccad49cff0d6a0a0b26ca892ec4ce33a)
| -rw-r--r-- | Configurations/15-android.conf | 5 |
1 files changed, 5 insertions, 0 deletions
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 |