[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  ca50d69cfe51f742ca052201fe4c5d851b28ae6c (commit)
      from  99ffd5ade5b2bbb03650416a292da7a583672967 (commit)


- Log -----------------------------------------------------------------
commit ca50d69cfe51f742ca052201fe4c5d851b28ae6c
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Mar 3 22:55:09 2020 +0100

    Configurations: Fix "android" configuration target
    
    This target gave '-pie' as a C flag when it should be a linker flag.
    Additionally, we add '-fPIE' as C flag for binaries.
    
    Fixes #11237
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/11238)

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

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 d8674978a5..d3b2ff6a1c 100644
--- a/Configurations/15-android.conf
+++ b/Configurations/15-android.conf
@@ -168,7 +168,8 @@ my %targets = (
         cppflags         => add(sub { android_ndk()->{cppflags} }),
         cxxflags         => add(sub { android_ndk()->{cflags} }),
         bn_ops           => sub { android_ndk()->{bn_ops} },
-        bin_cflags       => "-pie",
+        bin_cflags       => "-fPIE",
+        bin_lflags       => "-pie",
         enable           => [ ],
     },
     "android-arm" => {