From: Richard Levitte <levitte@openssl.org>
Date: Tue, 3 Mar 2020 21:55:09 +0000 (+0100)
Subject: Configurations: Fix "android" configuration target
X-Git-Tag: openssl-3.0.0-alpha1~266
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ca50d69cfe51f742ca052201fe4c5d851b28ae6c;p=oweals%2Fopenssl.git

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@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11238)
---

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" => {