config: don't add -Wa options with no-asm [from HEAD].
authorAndy Polyakov <appro@openssl.org>
Mon, 5 Sep 2011 16:33:48 +0000 (16:33 +0000)
committerAndy Polyakov <appro@openssl.org>
Mon, 5 Sep 2011 16:33:48 +0000 (16:33 +0000)
config

diff --git a/config b/config
index d7347cd57f0a4b92e777c8a1dafceffdbf43fe0f..2d9ab4d2a4b102fe591824b46f82c4e0b0d01472 100755 (executable)
--- a/config
+++ b/config
@@ -822,6 +822,7 @@ esac
 #  options="$options -DATALLA"
 #fi
 
 #  options="$options -DATALLA"
 #fi
 
+! expr "$options" : '.*no\-asm' > /dev/null && \
 ($CC -Wa,--help -c -o /dev/null -x assembler /dev/null 2>&1 | \
  grep \\--noexecstack) 2>&1 > /dev/null && \
   options="$options -Wa,--noexecstack"
 ($CC -Wa,--help -c -o /dev/null -x assembler /dev/null 2>&1 | \
  grep \\--noexecstack) 2>&1 > /dev/null && \
   options="$options -Wa,--noexecstack"