summaryrefslogtreecommitdiff
path: root/config
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 /config
parent0d94212a046e87fafea6e83e8ea2b2a58db49979 (diff)
downloadopenssl-new-0ad4078cd604797eec4b8922f169da5c2a1a16d3.tar.gz
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 'config')
-rwxr-xr-xconfig8
1 files changed, 0 insertions, 8 deletions
diff --git a/config b/config
index a44cd21e93..b8adf34999 100755
--- a/config
+++ b/config
@@ -840,14 +840,6 @@ if [ -n "$CONFIG_OPTIONS" ]; then
options="$options $CONFIG_OPTIONS"
fi
-if expr "$options" : '.*no\-asm' > /dev/null; then :; else
- if sh -c "$CROSS_COMPILE${CC:-gcc} -Wa,--help -c -o /tmp/null.$$.o -x assembler /dev/null && rm /tmp/null.$$.o" 2>&1 | \
- grep \\--noexecstack >/dev/null; then
- __CNF_CFLAGS="$__CNF_CFLAGS -Wa,--noexecstack"
- __CNF_CXXFLAGS="$__CNF_CXXFLAGS -Wa,--noexecstack"
- fi
-fi
-
# gcc < 2.8 does not support -march=ultrasparc
if [ "$OUT" = solaris-sparcv9-gcc -a $GCCVER -lt 28 ]
then