generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

GH429: Add clang to travis

Browse Source 
Signed-off-by: Rich Salz <rsalz@akamai.com>
Reviewed-by: Andy Polyakov <appro@openssl.org>
This commit is contained in:
Alessandro Ghedini 2015-10-12 16:15:43 -04:00 committed by Rich Salz
parent 2d2a83543f
commit f386742cfb
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.travis.yml
View File

@ -1,9 +1,13 @@
language: c language: c
addons: addons:
apt_packages: apt:
packages:
- gcc-5
- binutils-mingw-w64 - binutils-mingw-w64
- gcc-mingw-w64 - gcc-mingw-w64
sources:
- ubuntu-toolchain-r-test
os: os:
- linux - linux
@ -12,6 +16,7 @@ os:
compiler: compiler:
- clang - clang
- gcc - gcc
- gcc-5
- i686-w64-mingw32-gcc - i686-w64-mingw32-gcc
- x86_64-w64-mingw32-gcc - x86_64-w64-mingw32-gcc
@ -21,7 +26,13 @@ env:
- CONFIG_OPTS="--debug --strict-warnings" - CONFIG_OPTS="--debug --strict-warnings"
matrix: matrix:
include:
- os: linux
compiler: gcc-5
env: CONFIG_OPTS="--debug --strict-warnings -fsanitize=address"
exclude: exclude:
- os: osx
compiler: gcc-5
- os: osx - os: osx
compiler: i686-w64-mingw32-gcc compiler: i686-w64-mingw32-gcc
- os: osx - os: osx

2
Configure
View File

@ -1640,7 +1640,7 @@ if ($strict_warnings)
my $ecc = $cc; my $ecc = $cc;
$ecc = "clang" if `$cc --version 2>&1` =~ /clang/; $ecc = "clang" if `$cc --version 2>&1` =~ /clang/;
my $wopt; 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) foreach $wopt (split /\s+/, $gcc_devteam_warn)
{ {
$cflags .= " $wopt" unless ($cflags =~ /$wopt/) $cflags .= " $wopt" unless ($cflags =~ /$wopt/)