]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
projects / thirdparty / openssl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fa66f62)
android-x86 target: Add -latomic
authorMarcel Raad <Marcel.Raad@teamviewer.com>
Wed, 2 Mar 2022 18:57:24 +0000 (19:57 +0100)
committerTomas Mraz <tomas@openssl.org>
Wed, 9 Mar 2022 17:03:23 +0000 (18:03 +0100)
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)

Configurations/15-android.conf patch | blob | blame | history

diff --git a/Configurations/15-android.conf b/Configurations/15-android.conf
index 0b6b6d6832da07c7b340dd02eefad28b2b0d19f5..41ad9223e0945d65ecffc82e0e5c31fd130fd0fe 100644 (file)
--- 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" ],
Mirror of https://github.com/openssl/openssl.git