summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Raad <Marcel.Raad@teamviewer.com>2022-03-02 19:57:24 +0100
committerTomas Mraz <tomas@openssl.org>2022-03-09 18:03:59 +0100
commit28c1ac648600be928e35c47a780b07efd8b24ad1 (patch)
treeeb55b743a1408c725f6790349340f8054ae1b3f8
parent1e3c32b5743e33accd1368de451a25c967d0787d (diff)
downloadopenssl-new-28c1ac648600be928e35c47a780b07efd8b24ad1.tar.gz
android-x86 target: Add -latomic
Fixes https://github.com/openssl/openssl/issues/14083 again after being broken by https://github.com/openssl/openssl/pull/15640. CLA: trivial Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/17833) (cherry picked from commit b420e249370c4a85c4edd65fb445d20f9c19c44d)
-rw-r--r--Configurations/15-android.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/Configurations/15-android.conf b/Configurations/15-android.conf
index 0b6b6d6832..41ad9223e0 100644
--- a/Configurations/15-android.conf
+++ b/Configurations/15-android.conf
@@ -261,6 +261,7 @@ my %targets = (
bn_ops => add("RC4_INT"),
asm_arch => 'x86',
perlasm_scheme => "android",
+ ex_libs => add(threads("-latomic")),
},
"android-x86_64" => {
inherit_from => [ "android" ],