summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2017-08-29 14:29:07 +0200
committerAndy Polyakov <appro@openssl.org>2017-08-30 15:02:39 +0200
commite295d046dcdb83885d32eb08409e74849384ba60 (patch)
tree48d63b7f6cb9e9146f580f48f3e5f91639392526
parentImplement Aria GCM/CCM Modes and TLS cipher suites (diff)
downloadopenssl-e295d046dcdb83885d32eb08409e74849384ba60.tar.xz
openssl-e295d046dcdb83885d32eb08409e74849384ba60.zip
Revert "Allow --strict-warnings with the icc compiler as well"
This reverts commit a610934c3bdf2c0aafc633d4245efe3df289d716. Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Ben Kaduk <kaduk@mit.edu> (Merged from https://github.com/openssl/openssl/pull/4281)
-rwxr-xr-xConfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/Configure b/Configure
index 57cdeb3dc4..bdca5efb69 100755
--- a/Configure
+++ b/Configure
@@ -1324,8 +1324,8 @@ if (defined($config{api})) {
if ($strict_warnings)
{
my $wopt;
- die "ERROR --strict-warnings requires gcc, clang or icc"
- unless $ecc eq 'gcc' || $ecc eq 'clang' || $ecc eq 'icc';
+ die "ERROR --strict-warnings requires gcc or clang"
+ unless $ecc eq 'gcc' || $ecc eq 'clang';
foreach $wopt (split /\s+/, $gcc_devteam_warn)
{
$config{cflags} .= " $wopt" unless ($config{cflags} =~ /(?:^|\s)$wopt(?:\s|$)/)