[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  ac98d3860206bd31fd484baf163398bfb41e8595 (commit)
      from  7500bc337ae61ff370c8e77bb018114d73dfcf18 (commit)


- Log -----------------------------------------------------------------
commit ac98d3860206bd31fd484baf163398bfb41e8595
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Apr 23 15:37:03 2018 +0100

    Don't build AFALG on android
    
    This didn't get built anyway for gcc because it was detected as a cross
    compile. But it did get built for clang - even though this is still a cross
    compile build. This disables it in all cases for Android.
    
    Fixes #5748
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/6057)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/15-android.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Configurations/15-android.conf b/Configurations/15-android.conf
index d117386..9df4d94 100644
--- a/Configurations/15-android.conf
+++ b/Configurations/15-android.conf
@@ -132,6 +132,7 @@ my %targets = (
         cxxflags         => add(sub { android_ndk()->{cflags} }),
         bn_ops           => sub { android_ndk()->{bn_ops} },
         bin_cflags       => "-pie",
+        enable           => [ ],
     },
     "android-arm" => {
         ################################################################