diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-03-03 22:55:09 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-03-14 04:30:21 +0100 |
| commit | ca50d69cfe51f742ca052201fe4c5d851b28ae6c (patch) | |
| tree | f24b4c1d4285fe47b8d5c28b406e80cfcf1b2803 /Configurations/15-android.conf | |
| parent | Andoid cross compile: change ANDROID_NDK_HOME to ANDROID_NDK_ROOT (diff) | |
| download | openssl-ca50d69cfe51f742ca052201fe4c5d851b28ae6c.tar.xz openssl-ca50d69cfe51f742ca052201fe4c5d851b28ae6c.zip | |
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/15-android.conf')
| -rw-r--r-- | Configurations/15-android.conf | 3 |
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" => { |