summaryrefslogtreecommitdiffstats
path: root/Configurations/15-android.conf
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2018-05-04 14:06:44 +0200
committerAndy Polyakov <appro@openssl.org>2018-05-05 20:44:56 +0200
commit0ad4078cd604797eec4b8922f169da5c2a1a16d3 (patch)
tree952352331749f5c83e130b79f3b7800529cdfd8c /Configurations/15-android.conf
parent0d94212a046e87fafea6e83e8ea2b2a58db49979 (diff)
Configure: move --noexecstack probe to Configure.
config probe doesn't work in cross-compile scenarios or with clang. In addition consolidate -Qunused-arguments handling. Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/6174)
Diffstat (limited to 'Configurations/15-android.conf')
-rw-r--r--Configurations/15-android.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/Configurations/15-android.conf b/Configurations/15-android.conf
index 9df4d9446e..ddd642a117 100644
--- a/Configurations/15-android.conf
+++ b/Configurations/15-android.conf
@@ -65,7 +65,7 @@
my ($api, $arch) = ($1, $2);
my $triarch = $triplet{$arch};
- my $cflags = "-Wa,--noexecstack";
+ my $cflags;
my $cppflags;
# see if there is NDK clang on $PATH