[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  f386742cfb811a9d2c886240e90b1064511b9acf (commit)
      from  2d2a83543f757cf3a48a1a0e412aee183a6d539b (commit)


- Log -----------------------------------------------------------------
commit f386742cfb811a9d2c886240e90b1064511b9acf
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Mon Oct 12 16:15:43 2015 -0400

    GH429: Add clang to travis
    
    Signed-off-by: Rich Salz <rsalz at akamai.com>
    Reviewed-by: Andy Polyakov <appro at openssl.org>

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

Summary of changes:
 .travis.yml | 17 ++++++++++++++---
 Configure   |  2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c923119..f27b4b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,13 @@
 language: c
 
 addons:
-    apt_packages:
-        - binutils-mingw-w64
-        - gcc-mingw-w64
+    apt:
+        packages:
+            - gcc-5
+            - binutils-mingw-w64
+            - gcc-mingw-w64
+        sources:
+            - ubuntu-toolchain-r-test
 
 os:
     - linux
@@ -12,6 +16,7 @@ os:
 compiler:
     - clang
     - gcc
+    - gcc-5
     - i686-w64-mingw32-gcc
     - x86_64-w64-mingw32-gcc
 
@@ -21,8 +26,14 @@ env:
     - CONFIG_OPTS="--debug --strict-warnings"
 
 matrix:
+    include:
+        - os: linux
+          compiler: gcc-5
+          env: CONFIG_OPTS="--debug --strict-warnings -fsanitize=address"
     exclude:
         - os: osx
+          compiler: gcc-5
+        - os: osx
           compiler: i686-w64-mingw32-gcc
         - os: osx
           compiler: x86_64-w64-mingw32-gcc
diff --git a/Configure b/Configure
index b277957..06b2278 100755
--- a/Configure
+++ b/Configure
@@ -1640,7 +1640,7 @@ if ($strict_warnings)
 	my $ecc = $cc;
 	$ecc = "clang" if `$cc --version 2>&1` =~ /clang/;
 	my $wopt;
-	die "ERROR --strict-warnings requires gcc or clang" unless ($ecc =~ /gcc$/ or $ecc =~ /clang$/);
+	die "ERROR --strict-warnings requires gcc or clang" unless ($ecc =~ /gcc(-\d(\.\d)*)?$/ or $ecc =~ /clang$/);
 	foreach $wopt (split /\s+/, $gcc_devteam_warn)
 		{
 		$cflags .= " $wopt" unless ($cflags =~ /$wopt/)