summaryrefslogtreecommitdiffstats
path: root/Configurations
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2020-03-03 22:55:09 +0100
committerRichard Levitte <levitte@openssl.org>2020-03-14 04:30:21 +0100
commitca50d69cfe51f742ca052201fe4c5d851b28ae6c (patch)
treef24b4c1d4285fe47b8d5c28b406e80cfcf1b2803 /Configurations
parent99ffd5ade5b2bbb03650416a292da7a583672967 (diff)
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)
Diffstat (limited to 'Configurations')
-rw-r--r--Configurations/15-android.conf3
1 files changed, 2 insertions, 1 deletions
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" => {