[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  adc7e221f12462c6e10bc7c2c7afaf52490cb292 (commit)
      from  1039c7825535d8219b88372b7ad4a3b94c42605d (commit)


- Log -----------------------------------------------------------------
commit adc7e221f12462c6e10bc7c2c7afaf52490cb292
Author: batist73 <agrigoryev at gmail.com>
Date:   Sat Feb 2 13:45:06 2019 +0300

    Android build: fix usage of NDK home variable ($ndk_var)
    
    CLA: trivial
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/8153)

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

Summary of changes:
 Configurations/15-android.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Configurations/15-android.conf b/Configurations/15-android.conf
index c94da41..7b496a4 100644
--- a/Configurations/15-android.conf
+++ b/Configurations/15-android.conf
@@ -24,7 +24,8 @@
 
             my $ndk_var;
             my $ndk;
-            foreach $ndk_var (qw(ANDROID_NDK_HOME ANDROID_NDK)) {
+            foreach (qw(ANDROID_NDK_HOME ANDROID_NDK)) {
+                $ndk_var = $_;
                 $ndk = $ENV{$ndk_var};
                 last if defined $ndk;
             }