[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  a610934c3bdf2c0aafc633d4245efe3df289d716 (commit)
      from  bffa1ff8fbe20f2ca2264ac7cb3290dc07f234c2 (commit)


- Log -----------------------------------------------------------------
commit a610934c3bdf2c0aafc633d4245efe3df289d716
Author: Meena Vyas <meena.vyas at oracle.com>
Date:   Fri Aug 25 02:42:43 2017 +1000

    Allow --strict-warnings with the icc compiler as well
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4250)

-----------------------------------------------------------------------

Summary of changes:
 Configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Configure b/Configure
index 7089362..60dc1f4 100755
--- a/Configure
+++ b/Configure
@@ -1323,8 +1323,8 @@ if (defined($config{api})) {
 if ($strict_warnings)
 	{
 	my $wopt;
-	die "ERROR --strict-warnings requires gcc or clang"
-            unless $ecc eq 'gcc' || $ecc eq 'clang';
+	die "ERROR --strict-warnings requires gcc, clang or icc"
+            unless $ecc eq 'gcc' || $ecc eq 'clang' || $ecc eq 'icc';
 	foreach $wopt (split /\s+/, $gcc_devteam_warn)
 		{
 		$config{cflags} .= " $wopt" unless ($config{cflags} =~ /(?:^|\s)$wopt(?:\s|$)/)